server: fix issue that vm guest os type is reset after updatetemplate (#4377)

ustcweizhou · web-flow · commit f7a3701c7a2f · 2020-10-15T17:54:59.000Z
diff --git a/server/src/main/java/com/cloud/template/TemplateManagerImpl.java b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java
@@ -2063,6 +2063,7 @@ private VMTemplateVO updateTemplateOrIso(BaseUpdateTemplateOrIsoCmd cmd) {
             ex.addProxyObject(String.valueOf(id), "templateId");
             throw ex;
         }
+        long oldGuestOSId = template.getGuestOSId();
 
         verifyTemplateId(id);
 
@@ -2119,7 +2120,6 @@ private VMTemplateVO updateTemplateOrIso(BaseUpdateTemplateOrIsoCmd cmd) {
         }
 
         if (guestOSId != null) {
-            long oldGuestOSId = template.getGuestOSId();
             GuestOSVO guestOS = _guestOSDao.findById(guestOSId);
 
             if (guestOS == null) {

Original file line number	Diff line number	Diff line change
`@@ -2063,6 +2063,7 @@ private VMTemplateVO updateTemplateOrIso(BaseUpdateTemplateOrIsoCmd cmd) {`
`2063`	`2063`	`ex.addProxyObject(String.valueOf(id), "templateId");`
`2064`	`2064`	`throw ex;`
`2065`	`2065`	`}`
	`2066`	`+ long oldGuestOSId = template.getGuestOSId();`
`2066`	`2067`
`2067`	`2068`	`verifyTemplateId(id);`
`2068`	`2069`
`@@ -2119,7 +2120,6 @@ private VMTemplateVO updateTemplateOrIso(BaseUpdateTemplateOrIsoCmd cmd) {`
`2119`	`2120`	`}`
`2120`	`2121`
`2121`	`2122`	`if (guestOSId != null) {`
`2122`		`- long oldGuestOSId = template.getGuestOSId();`
`2123`	`2123`	`GuestOSVO guestOS = _guestOSDao.findById(guestOSId);`
`2124`	`2124`
`2125`	`2125`	`if (guestOS == null) {`