CLOUDSTACK-5639: If path field in the TO already has the complete path, do

devdeep · devdeep · commit db2b0256080d · 2014-01-10T16:37:43.000+05:30
not try to generate the path.
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/CloudStackTypes.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/CloudStackTypes.cs
@@ -168,16 +168,23 @@ public string FullFileName
                 }
                 else if (this.nfsDataStore != null)
                 {
-                    fileName = this.nfsDataStore.UncPath;
-                    if (this.path != null)
+                    if (this.path != null && File.Exists(this.path))
                     {
-                        fileName += @"\" + this.path;
+                        fileName = this.path;
                     }
-
-                    fileName = Utils.NormalizePath(fileName);
-                    if (Directory.Exists(fileName))
+                    else
                     {
-                        fileName = Utils.NormalizePath(fileName + @"\" + this.name);
+                        fileName = this.nfsDataStore.UncPath;
+                        if (this.path != null)
+                        {
+                            fileName += @"\" + this.path;
+                        }
+
+                        fileName = Utils.NormalizePath(fileName);
+                        if (Directory.Exists(fileName))
+                        {
+                            fileName = Utils.NormalizePath(fileName + @"\" + this.name);
+                        }
                     }
                 }
                 else

Original file line number	Diff line number	Diff line change
`@@ -168,16 +168,23 @@ public string FullFileName`
`168`	`168`	`}`
`169`	`169`	`else if (this.nfsDataStore != null)`
`170`	`170`	`{`
`171`		`- fileName = this.nfsDataStore.UncPath;`
`172`		`- if (this.path != null)`
	`171`	`+ if (this.path != null && File.Exists(this.path))`
`173`	`172`	`{`
`174`		`- fileName += @"\" + this.path;`
	`173`	`+ fileName = this.path;`
`175`	`174`	`}`
`176`		`-`
`177`		`- fileName = Utils.NormalizePath(fileName);`
`178`		`- if (Directory.Exists(fileName))`
	`175`	`+ else`
`179`	`176`	`{`
`180`		`- fileName = Utils.NormalizePath(fileName + @"\" + this.name);`
	`177`	`+ fileName = this.nfsDataStore.UncPath;`
	`178`	`+ if (this.path != null)`
	`179`	`+ {`
	`180`	`+ fileName += @"\" + this.path;`
	`181`	`+ }`
	`182`	`+`
	`183`	`+ fileName = Utils.NormalizePath(fileName);`
	`184`	`+ if (Directory.Exists(fileName))`
	`185`	`+ {`
	`186`	`+ fileName = Utils.NormalizePath(fileName + @"\" + this.name);`
	`187`	`+ }`
`181`	`188`	`}`
`182`	`189`	`}`
`183`	`190`	`else`