incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r996915 - /sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerImpl.java
Date Tue, 14 Sep 2010 14:26:47 GMT
Author: cziegeler
Date: Tue Sep 14 14:26:47 2010
New Revision: 996915

URL: http://svn.apache.org/viewvc?rev=996915&view=rev
Log:
Skip unknown resource types immediately for now

Modified:
    sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerImpl.java

Modified: sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerImpl.java?rev=996915&r1=996914&r2=996915&view=diff
==============================================================================
--- sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerImpl.java
(original)
+++ sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerImpl.java
Tue Sep 14 14:26:47 2010
@@ -199,8 +199,13 @@ public class OsgiInstallerImpl
             for(final InstallableResource r : resources ) {
                 try {
                     final RegisteredResource rr = RegisteredResourceImpl.create(ctx, r, scheme);
-                    createdResources.add(rr);
-                    logger.debug("Adding new resource {}", rr);
+                    final String rt = rr.getType();
+                    if ( InstallableResource.TYPE_BUNDLE.equals(rt) || InstallableResource.TYPE_CONFIG.equals(rt)
) {
+                        createdResources.add(rr);
+                        logger.debug("Adding new resource {}", rr);
+                    } else {
+                        logger.debug("Ignoring unsupported resource type {} of resource {}",
rt, rr);
+                    }
                 } catch (final IOException ioe) {
                     logger.warn("Cannot create RegisteredResource (resource will be ignored):"
+ r, ioe);
                 }



Mime
View raw message