You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ti...@apache.org on 2011/02/07 18:22:40 UTC

svn commit: r1068021 - /aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/AbstractProxyManager.java

Author: timothyjward
Date: Mon Feb  7 17:22:39 2011
New Revision: 1068021

URL: http://svn.apache.org/viewvc?rev=1068021&view=rev
Log:
[ARIES-563] The NamespaceHandlerRegistryImpl does not actually reuse parsed schemas - fix proxy NPE that causes iTest failures

Modified:
    aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/AbstractProxyManager.java

Modified: aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/AbstractProxyManager.java
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/AbstractProxyManager.java?rev=1068021&r1=1068020&r2=1068021&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/AbstractProxyManager.java (original)
+++ aries/trunk/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/AbstractProxyManager.java Mon Feb  7 17:22:39 2011
@@ -70,7 +70,7 @@ public abstract class AbstractProxyManag
   
   public final boolean isProxy(Object proxy)
   {
-    return (getInvocationHandler(proxy) instanceof ProxyHandler);
+    return (proxy != null && getInvocationHandler(proxy) instanceof ProxyHandler);
   }
   
   protected abstract Object createNewProxy(Bundle clientBundle, Collection<Class<?>> classes,