svn commit: r1157109 - /sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/services/DefaultPortletRegistryService.java

[cziegeler]

Author: cziegeler
Date: Fri Aug 12 13:54:01 2011
New Revision: 1157109

URL: http://svn.apache.org/viewvc?rev=1157109&view=rev
Log:
Reset classloader before doing xml stuff

Modified:
    
sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/services/DefaultPortletRegistryService.java

Modified: 
sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/services/DefaultPortletRegistryService.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/services/DefaultPortletRegistryService.java?rev=1157109&r1=1157108&r2=1157109&view=diff
==============================================================================
--- 
sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/services/DefaultPortletRegistryService.java
 (original)
+++ 
sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/services/DefaultPortletRegistryService.java
 Fri Aug 12 13:54:01 2011
@@ -304,6 +304,7 @@ public class DefaultPortletRegistryServi
                     "'. Are you sure it is in the deployed package?");
             }
             portletApp = portletDDService.read(name, contextPath, paIn);
+            Thread.currentThread().setContextClassLoader(oldTCCL);
             portletDDService.mergeWebDescriptor(portletApp, webIn);
         } catch (Exception ex) {
             throw new PortletContainerException("Unable to load portlet 
descriptor for context " + contextPath, ex);