[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rhq-commits
Subject:    [rhq] Branch 'gwt' - modules/enterprise
From:       mazz () fedoraproject ! org (mazz)
Date:       2010-04-29 20:49:35
Message-ID: 20100429204935.38C57120102 () lists ! fedorahosted ! org
[Download RAW message or body]

 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java \
|   26 +++++-----  1 file changed, 14 insertions(+), 12 deletions(-)

New commits:
commit 905e0f7b8871d7f8e551d177dd095a93ced12669
Author: John Mazzitelli <mazz at redhat.com>
Date:   Thu Apr 29 16:49:30 2010 -0400

    allow bundle files to be null, meaning the distro did not have any

diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java \
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java
 index 1445779..5ac268c 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java
                
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java
 @@ -408,18 +408,20 @@ public class BundleManagerBean implements BundleManagerLocal, \
BundleManagerRemot  // the bundle distribution
         try {
             Map<String, File> bundleFiles = info.getBundleFiles();
-            for (String fileName : bundleFiles.keySet()) {
-                File file = bundleFiles.get(fileName);
-                InputStream is = null;
-                try {
-                    is = new FileInputStream(file);
-                    BundleFile bundleFile = bundleManager.addBundleFile(subject, \
                bundleVersion.getId(), fileName,
-                        "1.0", null, is);
-                    log.debug("Added bundle file [" + bundleFile + "] to \
                BundleVersion [" + bundleVersion + "]");
-                } finally {
-                    safeClose(is);
-                    if (null != file) {
-                        file.delete();
+            if (bundleFiles != null) {
+                for (String fileName : bundleFiles.keySet()) {
+                    File file = bundleFiles.get(fileName);
+                    InputStream is = null;
+                    try {
+                        is = new FileInputStream(file);
+                        BundleFile bundleFile = bundleManager.addBundleFile(subject, \
bundleVersion.getId(), fileName, +                            "1.0", null, is);
+                        log.debug("Added bundle file [" + bundleFile + "] to \
BundleVersion [" + bundleVersion + "]"); +                    } finally {
+                        safeClose(is);
+                        if (null != file) {
+                            file.delete();
+                        }
                     }
                 }
             }


[prev in list] [next in list] [prev in thread] [next in thread]