You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by mn...@apache.org on 2014/12/18 16:05:20 UTC
svn commit: r1646472 -
/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/EntityManagerFactoryManager.java
Author: mnuttall
Date: Thu Dec 18 15:05:20 2014
New Revision: 1646472
URL: http://svn.apache.org/r1646472
Log:
Aries-1075: NullPointerException in EntityManagerFactoryManager.providerRemoved - from a patch by Simon Gormley
Modified:
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/EntityManagerFactoryManager.java
Modified: aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/EntityManagerFactoryManager.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/EntityManagerFactoryManager.java?rev=1646472&r1=1646471&r2=1646472&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/EntityManagerFactoryManager.java (original)
+++ aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/EntityManagerFactoryManager.java Thu Dec 18 15:05:20 2014
@@ -124,9 +124,12 @@ public class EntityManagerFactoryManager
* @param ref The provider service reference
* @return true if the the provider is being used by this manager
*/
- public synchronized boolean providerRemoved(ServiceReference ref) {
-
- boolean toReturn = provider.equals(ref);
+ public synchronized boolean providerRemoved(ServiceReference ref)
+ {
+ boolean toReturn = false;
+ if (provider != null) {
+ toReturn = provider.equals(ref);
+ }
if(toReturn)
destroy();