NIHVIVO-2066 unregistering external namespace listeners

webapp/src/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactory.java

@@ -138,4 +138,6 @@ public interface WebappDaoFactory {
     public PageDao getPageDao();    
     
     public MenuDao getMenuDao();    
+    
+    public void close();
 }

webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/WebappDaoFactoryFiltering.java

@@ -316,4 +316,9 @@ public class WebappDaoFactoryFiltering implements WebappDaoFactory {
     public DisplayModelDao getDisplayModelDao(){
         return innerWebappDaoFactory.getDisplayModelDao();
     }
+    
+    @Override 
+    public void close() {
+        innerWebappDaoFactory.close();
+    }
 }

webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ApplicationDaoJena.java

@@ -8,6 +8,7 @@ import java.util.List;
 import com.hp.hpl.jena.ontology.OntModel;
 import com.hp.hpl.jena.rdf.listeners.StatementListener;
 import com.hp.hpl.jena.rdf.model.Literal;
+import com.hp.hpl.jena.rdf.model.ModelChangedListener;
 import com.hp.hpl.jena.rdf.model.NodeIterator;
 import com.hp.hpl.jena.rdf.model.Property;
 import com.hp.hpl.jena.rdf.model.RDFNode;
@@ -26,14 +27,20 @@ public class ApplicationDaoJena extends JenaBaseDao implements ApplicationDao {
     
 	Integer portalCount = null;
 	List<String> externallyLinkedNamespaces = null;
+    ModelChangedListener modelChangedListener = null;
 	
     public ApplicationDaoJena(WebappDaoFactoryJena wadf) {
         super(wadf);
-        getOntModelSelector().getDisplayModel().register(
+        modelChangedListener = new ExternalNamespacesChangeListener();
-                new ExternalNamespacesChangeListener());
+        getOntModelSelector().getDisplayModel().register(modelChangedListener);
     }
-	   
+    
-	
+    public void close() {
+        if (modelChangedListener != null) {
+            getOntModelSelector().getDisplayModel().unregister(modelChangedListener);
+        }
+    }
+	   	
 	public boolean isFlag1Active() {
 		boolean somePortalIsFiltering=false;		
 		if (portalCount == null) {

webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java

@@ -73,7 +73,7 @@ public class WebappDaoFactoryJena implements WebappDaoFactory {
     protected KeywordDao keywordDao;
     protected LinksDao linksDao;
     protected LinktypeDao linktypeDao;
-    protected ApplicationDao applicationDao;
+    protected ApplicationDaoJena applicationDao;
     protected PortalDao portalDao;
     protected TabDao tabDao;
     protected TabIndividualRelationDao tabs2EntsDao;
@@ -658,5 +658,12 @@ public class WebappDaoFactoryJena implements WebappDaoFactory {
     public DisplayModelDao getDisplayModelDao(){
         return new DisplayModelDaoJena( this );
     }
+    
+    @Override
+    public void close() {
+        if (applicationDao != null) {
+            applicationDao.close();
+        }   
+    }
    
 }

webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java

@@ -198,6 +198,6 @@ public class WebappDaoFactorySDB extends WebappDaoFactoryJena {
             }
 	    }
 	    
-	}
+	}    
 	
 }

webapp/src/edu/cornell/mannlib/vitro/webapp/filters/WebappDaoFactorySDBPrep.java

@@ -85,31 +85,28 @@ public class WebappDaoFactorySDBPrep implements Filter {
 		SDBConnection conn = null;
 		Store store = null;
 		Dataset dataset = null;
+		WebappDaoFactory wadf = null;
 		
-		try {
+		try {		
-			if ( request instanceof HttpServletRequest 
+		    if (bds == null || storeDesc == null || oms == null) {
-				     && JenaDataSourceSetupBase.isSDBActive()) {
+		        throw new RuntimeException("SDB store not property set up");
-					
+		    }
-			    if (bds == null || storeDesc == null || oms == null) {
+		    
-			        throw new RuntimeException("SDB store not property set up");
+			try {
-			    }
+			    sqlConn = bds.getConnection();
-			    
+				conn = new SDBConnection(sqlConn) ;
-				try {
+			} catch (SQLException sqe) {
-				    sqlConn = bds.getConnection();
+				throw new RuntimeException("Unable to connect to database", sqe);
-					conn = new SDBConnection(sqlConn) ;
+			}
-				} catch (SQLException sqe) {
+			if (conn != null) {
-					throw new RuntimeException("Unable to connect to database", sqe);
+				store = SDBFactory.connectStore(conn, storeDesc);
-				}
+				dataset = SDBFactory.connectDataset(store);
-				if (conn != null) {
+				VitroRequest vreq = new VitroRequest((HttpServletRequest) request);
-					store = SDBFactory.connectStore(conn, storeDesc);
+				wadf = 
-					dataset = SDBFactory.connectDataset(store);
+					new WebappDaoFactorySDB(oms, dataset, defaultNamespace, null, null);
-					VitroRequest vreq = new VitroRequest((HttpServletRequest) request);
+				vreq.setWebappDaoFactory(wadf);
-					WebappDaoFactory wadf = 
+				vreq.setFullWebappDaoFactory(wadf);
-						new WebappDaoFactorySDB(oms, dataset, defaultNamespace, null, null);
+				vreq.setDataset(dataset);
-					vreq.setWebappDaoFactory(wadf);
-					vreq.setFullWebappDaoFactory(wadf);
-					vreq.setDataset(dataset);
-				}
 			}
 		} catch (Throwable t) {
 			log.error("Unable to filter request to set up SDB connection", t);
@@ -124,19 +121,15 @@ public class WebappDaoFactorySDBPrep implements Filter {
 			if (conn != null) {
 				conn.close();
 			}
-			if (sqlConn != null) {
-			    try {
-			        sqlConn.close();
-			    } catch (SQLException e) {
-			        log.error("Unable to close SQL connection", e);
-			    }
-			}
 			if (dataset != null) {
 			    dataset.close();
 			}
 			if (store != null) {
 			    store.close();
 			}
+			if (wadf != null) {
+			    wadf.close();
+			}
 		}
 		
 	}