Merge pull request #89 from juanfem/issue_88

Setting factory to null after destroying it, so that the next time th…

Author: shroffk

pvAccessJava/src/org/epics/ca/ClientFactory.java

@@ -78,12 +78,18 @@ public ChannelProvider newInstance() {
 	        }
 		}
 
-		public synchronized void destroySharedInstance() {
+		public synchronized boolean destroySharedInstance() {
+			boolean destroyed = true;
 			if (channelProvider != null)
 			{
-				channelProvider.destroy();
-				channelProvider = null;
+    				try{
+    				    	channelProvider.destroy();
+    				    	channelProvider = null;
+    				} catch (Exception ex) {
+    				    	destroyed = false;
+    				}
 			}
+			return destroyed;
 		}
     }
 
@@ -103,7 +109,10 @@ public static synchronized void stop() {
     	if (factory != null)
     	{
     		ChannelProviderRegistryFactory.unregisterChannelProviderFactory(factory);
-    		factory.destroySharedInstance();
+    		if(factory.destroySharedInstance())  
+    		{
+    			factory=null;
+    		}
     	}
     }
 

pvAccessJava/src/org/epics/pvaccess/ClientFactory.java

@@ -70,12 +70,15 @@ public ChannelProvider newInstance() {
 	        }
 		}
 
-		public synchronized void destroySharedInstance() {
+		public synchronized boolean destroySharedInstance() {
+			boolean destroyed = true;
 			if (context != null)
 			{
 				context.dispose();
+				destroyed = context.isDestroyed();
 				context = null;
 			}
+			return destroyed;
 		}
     }
 
@@ -95,7 +98,10 @@ public static synchronized void stop() {
     	if (factory != null)
     	{
     		ChannelProviderRegistryFactory.unregisterChannelProviderFactory(factory);
-    		factory.destroySharedInstance();
+    		if(factory.destroySharedInstance())  
+    		{
+    			factory=null;
+    		}
     	}
     }
 }