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

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

Author: kurt.stam at jboss.com
Date: 2007-01-10 14:59:21 -0500 (Wed, 10 Jan 2007)
New Revision: 8804

Modified:
   labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouter.java
Log:
Adding error logging if the rules cannot be found.

Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouter.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouter.java	2007-01-10 17:43:09 UTC (rev 8803)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouter.java	2007-01-10 19:59:21 UTC (rev 8804)
@@ -103,11 +103,11 @@
 			if (ruleBase==null || isRulesChanged) {
 			    logger.log(Priority.INFO, "Reading ruleSet from file=" + ruleSet);
 			    ruleBase = readRuleBase(ruleSet, ruleLanguage);
-				ruleBases.put(ruleSet, ruleBase);
+				if (ruleBase!=null) ruleBases.put(ruleSet, ruleBase);
 				if (newRuleSet==null) {
 					newRuleSet = getRules(ruleSet, ruleLanguage);
 				}
-				ruleSets.put(ruleSet, newRuleSet);
+				if (ruleSet!=null)ruleSets.put(ruleSet, newRuleSet);
 			}
 			WorkingMemory workingMemory = ruleBase.newWorkingMemory();
 			logger.log(Priority.DEBUG, "Obtained message=" + message + " with ruleSet=" + ruleSet);
@@ -138,23 +138,32 @@
 		//read in the rules
 		logger.debug("Going to read the rule: " + rulesFile);
 		InputStream inputStreamDrl = JBossRulesRouter.class.getResourceAsStream( "/" + rulesFile );
-		Reader rules = new InputStreamReader(inputStreamDrl);
-		PackageBuilder builder = new PackageBuilder();
-		//this wil parse and compile in one step
-		if (ruleLanguage==null) {
-			builder.addPackageFromDrl(rules);
+		if (inputStreamDrl==null) {
+			logger.error("Could not find rulesFile: " + rulesFile);
+			return null;
 		} else {
-			logger.debug("Going to read the language: " + ruleLanguage);
-			InputStream inputStreamDsl = JBossRulesRouter.class.getResourceAsStream( "/" + ruleLanguage );
-			Reader dsl = new InputStreamReader(inputStreamDsl);
-			builder.addPackageFromDrl(rules, dsl);
+			Reader rules = new InputStreamReader(inputStreamDrl);
+			PackageBuilder builder = new PackageBuilder();
+			//this wil parse and compile in one step
+			if (ruleLanguage==null) {
+				builder.addPackageFromDrl(rules);
+			} else {
+				logger.debug("Going to read the language: " + ruleLanguage);
+				InputStream inputStreamDsl = JBossRulesRouter.class.getResourceAsStream( "/" + ruleLanguage );
+				if (inputStreamDsl==null) {
+					logger.error("Could not find ruleLanguage: " + rulesFile);
+				} else {
+					Reader dsl = new InputStreamReader(inputStreamDsl);
+					builder.addPackageFromDrl(rules, dsl);
+				}
+			}
+			//get the compiled package (which is serializable)
+			Package pkg = builder.getPackage();
+			//add the package to a rulebase (deploy the rule package).
+			RuleBase ruleBase = RuleBaseFactory.newRuleBase();
+			ruleBase.addPackage(pkg);
+			return ruleBase;
 		}
-		//get the compiled package (which is serializable)
-		Package pkg = builder.getPackage();
-		//add the package to a rulebase (deploy the rule package).
-		RuleBase ruleBase = RuleBaseFactory.newRuleBase();
-		ruleBase.addPackage(pkg);
-		return ruleBase;
 	}
 	
     /**
@@ -165,14 +174,24 @@
 	{
 		logger.debug("Going to hash the rule: " + rulesFile);
 		InputStream inputStreamDrl = JBossRulesRouter.class.getResourceAsStream( "/" + rulesFile );
-		String rules = getString(inputStreamDrl);
-		String language = "";
-		if (ruleLanguage!=null) {
-			logger.debug("Going to hash the language: " + ruleLanguage);
-			InputStream inputStreamDsl = JBossRulesRouter.class.getResourceAsStream( "/" + ruleLanguage );
-			language = getString(inputStreamDsl);
+		if (inputStreamDrl==null) {
+			logger.error("Could not find rulesFile: " + rulesFile);
+			return null;
+		} else {
+			String rules = getString(inputStreamDrl);
+			String language = "";
+			if (ruleLanguage!=null) {
+				logger.debug("Going to hash the language: " + ruleLanguage);
+				InputStream inputStreamDsl = JBossRulesRouter.class.getResourceAsStream( "/" + ruleLanguage );
+				if (inputStreamDrl==null) {
+					logger.error("Could not find language: " + ruleLanguage);
+				} else {
+					language = getString(inputStreamDsl);
+				}
+			}
+			return rules + language;
 		}
-		return rules + language;
+		
 	}
 	
 	private static String getString(InputStream in) throws IOException