[jboss-svn-commits] JBL Code SVN: r15263 - labs/jbossesb/trunk/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/routing/cbr.

[jboss-svn-commits at lists.jboss.org]

Author: kurt.stam at jboss.com
Date: 2007-09-20 11:46:29 -0400 (Thu, 20 Sep 2007)
New Revision: 15263

Modified:
   labs/jbossesb/trunk/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouter.java
Log:
JBESB-1002, fixing bug with not closing InputStreams to drl and dsl files.

Modified: labs/jbossesb/trunk/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouter.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouter.java	2007-09-20 15:22:10 UTC (rev 15262)
+++ labs/jbossesb/trunk/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouter.java	2007-09-20 15:46:29 UTC (rev 15263)
@@ -39,11 +39,9 @@
 import org.drools.compiler.PackageBuilder;
 import org.drools.compiler.PackageBuilderConfiguration;
 import org.drools.rule.Package;
-import org.jboss.soa.esb.ConfigurationException;
 import org.jboss.internal.soa.esb.services.routing.cbr.JBRulesCounter;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.services.registry.RegistryException;
 import org.jboss.soa.esb.services.routing.MessageRouterException;
 import org.jboss.soa.esb.services.routing.cbr.CBRException;
 import org.jboss.soa.esb.services.routing.cbr.ContentBasedRouter;
@@ -64,7 +62,6 @@
 
 	private static Logger logger = Logger.getLogger(JBossRulesRouter.class);
 	
-	private ConfigTree m_config;
 	private JBRulesCounter rulesCounter = null;
 	
 	/**
@@ -221,7 +218,9 @@
 					Reader dsl = new InputStreamReader(inputStreamDsl);
 					builder.addPackageFromDrl(rules, dsl);
 				}
+                inputStreamDsl.close();
 			}
+            inputStreamDrl.close();
 			// get the compiled package (which is serializable)
 			Package pkg = builder.getPackage();
 			// add the package to a rulebase (deploy the rule package).
@@ -253,18 +252,20 @@
 		else
 		{
 			String rules = getString(inputStreamDrl);
+            inputStreamDrl.close();
 			String language = "";
 			if (ruleLanguage != null)
 			{
 				logger.debug("Going to hash the language: " + ruleLanguage);
 				InputStream inputStreamDsl = ClassUtil.getResourceAsStream("/" + ruleLanguage, JBossRulesRouter.class);
-				if (inputStreamDrl == null)
+				if (inputStreamDsl == null)
 				{
 					logger.error("Could not find language: " + ruleLanguage);
 				}
 				else
 				{
 					language = getString(inputStreamDsl);
+                    inputStreamDsl.close();
 				}
 			}
 			return rules + language;
@@ -285,7 +286,6 @@
 
 	@Override
 	public void setConfigTree(ConfigTree configTree) {
-		m_config = configTree;
 		rulesCounter = new JBRulesCounter(configTree);
 		rulesCounter.registerMBean();
 	}