Github user sedukull commented on a diff in the pull request:

    https://github.com/apache/cloudstack/pull/669#discussion_r36611512
  
    --- Diff: 
plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
 ---
    @@ -595,6 +597,25 @@ private PlugNicAnswer execute(PlugNicCommand cmd) {
             }
         }
     
    +    private CopyFileInVmAnswer execute(CopyFileInVmCommand cmd) {
    +        File keyFile = getSystemVMKeyFile();
    +        try {
    +            File file = new File(cmd.getSrc());
    +            if(file.exists()) {
    +                if(file.isDirectory()) {
    +                    for (File f : FileUtils.listFiles(new 
File(cmd.getSrc()), TrueFileFilter.INSTANCE, TrueFileFilter.INSTANCE)) {
    +                        SshHelper.scpTo(cmd.getVmIp(), 3922, "root", 
keyFile, null, cmd.getDest(), f.getCanonicalPath(), null);
    +                    }
    +                } else {
    +                    SshHelper.scpTo(cmd.getVmIp(), 3922, "root", keyFile, 
null, cmd.getDest(), file.getCanonicalPath(), null);
    +                }
    +            }
    +        } catch (Exception e) {
    +            s_logger.error("Fail to copy file " + cmd.getSrc() + " in VM " 
+ cmd.getVmIp(), e);
    +            return new CopyFileInVmAnswer(cmd, e);
    +        }
    +        return new CopyFileInVmAnswer(cmd);
    --- End diff --
    
    I mean in case a copyfilein..if moved inside try block throws an exception 
, then the code return new...copyfile inside catch still works.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

Reply via email to