Liron Aravot has uploaded a new change for review.

Change subject: core: ProcessOvfUpdate - skip vms/templates without ovf
......................................................................

core: ProcessOvfUpdate - skip vms/templates without ovf

When ovf hasn't been generated yet for a vm/template, avoid trying to
add it's ovf to the created tar.

Change-Id: I4de180c59e7e82b380bfc12f5d72f9b7c2a4f468
Bug-Url: https://bugzilla.redhat.com/1129258
Signed-off-by: Liron Aravot <[email protected]>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ProcessOvfUpdateForStorageDomainCommand.java
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/89/31489/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ProcessOvfUpdateForStorageDomainCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ProcessOvfUpdateForStorageDomainCommand.java
index 62b383b..affe0f1 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ProcessOvfUpdateForStorageDomainCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ProcessOvfUpdateForStorageDomainCommand.java
@@ -317,7 +317,9 @@
 
     protected void buildFilesForOvfs(List<Pair<Guid, String>> ovfs, 
InMemoryTar inMemoryTar) throws Exception {
         for (Pair<Guid, String> pair : ovfs) {
-            inMemoryTar.addTarEntry(pair.getSecond().getBytes(), 
pair.getFirst() + ".ovf");
+            if (pair.getSecond() != null) {
+                inMemoryTar.addTarEntry(pair.getSecond().getBytes(), 
pair.getFirst() + ".ovf");
+            }
         }
     }
 


-- 
To view, visit http://gerrit.ovirt.org/31489
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4de180c59e7e82b380bfc12f5d72f9b7c2a4f468
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Liron Aravot <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to