geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1089612 - /geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java
Date Wed, 06 Apr 2011 20:13:40 GMT
Author: gawor
Date: Wed Apr  6 20:13:40 2011
New Revision: 1089612

URL: http://svn.apache.org/viewvc?rev=1089612&view=rev
Log:
GERONIMO-5861: Minor formatting fixes

Modified:
    geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java

Modified: geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java?rev=1089612&r1=1089611&r2=1089612&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java
(original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java
Wed Apr  6 20:13:40 2011
@@ -42,6 +42,7 @@ import org.apache.geronimo.gbean.annotat
 import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.geronimo.kernel.util.IOUtils;
 import org.apache.xbean.osgi.bundle.util.BundleUtils;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
@@ -115,58 +116,57 @@ public class ApplicationGBean implements
         }
     }
 
-    public long[] getApplicationContentBundleIds(){
+    public long[] getApplicationContentBundleIds() {
         long[] ids = new long[applicationBundles.size()];
-        int i =0;
-        for (Bundle content : applicationBundles){
+        int i = 0;
+        for (Bundle content : applicationBundles) {
             ids[i++] = content.getBundleId();
         }
         return ids;
     }
-    
-    public String getApplicationContentBundleSymbolicName(long bundleId){
-        for (Bundle content : applicationBundles){
-            if (content.getBundleId()==bundleId){
+
+    public String getApplicationContentBundleSymbolicName(long bundleId) {
+        for (Bundle content : applicationBundles) {
+            if (content.getBundleId() == bundleId) {
                 return content.getSymbolicName();
             }
         }
         return null;
     }
-    
-    public void updateApplicationContent(long bundleId, File bundleFile) throws IOException,
BundleException{
+
+    public void updateApplicationContent(long bundleId, File bundleFile) throws IOException,
BundleException {
         Bundle targetBundle = null;
-        for (Bundle content : applicationBundles){
-            if (content.getBundleId()==bundleId){
+        for (Bundle content : applicationBundles) {
+            if (content.getBundleId() == bundleId) {
                 targetBundle = content;
                 break;
             }
         }
         
-        if (targetBundle!=null){
-            BundleContext context = bundle.getBundleContext();
-            ServiceReference reference = null;
+        if (targetBundle != null) {
             FileInputStream fi = null;
             try {
                 fi = new FileInputStream(bundleFile);
                 // update bundle
                 targetBundle.update(fi);
-                // refresh bundle
-                reference = context.getServiceReference(PackageAdmin.class.getName());
-                PackageAdmin packageAdmin = (PackageAdmin) context.getService(reference);
-                packageAdmin.refreshPackages(new Bundle[]{targetBundle});
-            } finally{
-                if (reference!=null){
-                    context.ungetService(reference);
-                }
-                if (fi!=null){
-                    fi.close();
-                }
+            } finally {
+                IOUtils.close(fi);
             }
+            
+            // refresh bundle
+            refreshPackages(bundle.getBundleContext(), new Bundle[] { targetBundle });
         } else {
-            throw new IllegalArgumentException("Could not find the bundle with id: " + bundleId
+ "in the Application content");
+            throw new IllegalArgumentException("Could not find bundle with id " + bundleId
+ " in the application");
         }
     }
     
+    private void refreshPackages(BundleContext context, Bundle[] bundles) {
+        ServiceReference reference = context.getServiceReference(PackageAdmin.class.getName());
+        PackageAdmin packageAdmin = (PackageAdmin) context.getService(reference);
+        packageAdmin.refreshPackages(bundles);
+        context.ungetService(reference);
+    }
+    
     protected Bundle getBundle() {
         return bundle;
     }



Mime
View raw message