[jboss-svn-commits] JBL Code SVN: r8568 - in labs/jbosslabs/trunk/portal-extensions/jmm: jmm-common/src/java/org/jboss/forge/jmm/common/protocol/conf jmm-service/src/java/org/jboss/forge/jmm/service/impl

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

Author: wrzep
Date: 2006-12-22 17:45:50 -0500 (Fri, 22 Dec 2006)
New Revision: 8568

Modified:
   labs/jbosslabs/trunk/portal-extensions/jmm/jmm-common/src/java/org/jboss/forge/jmm/common/protocol/conf/Plugin.java
   labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/src/java/org/jboss/forge/jmm/service/impl/ScoresDailyUpdater.java
Log:
JBLAB-599

1. NPE fix.
2. Catch all exceptions in @Timeout method invocation. Otherwise the stack trace doesn't appear in the logs.

Pawel


Modified: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-common/src/java/org/jboss/forge/jmm/common/protocol/conf/Plugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-common/src/java/org/jboss/forge/jmm/common/protocol/conf/Plugin.java	2006-12-22 22:37:30 UTC (rev 8567)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-common/src/java/org/jboss/forge/jmm/common/protocol/conf/Plugin.java	2006-12-22 22:45:50 UTC (rev 8568)
@@ -155,7 +155,7 @@
 		
 		long v = Constants.DEFAULT_PLUGIN_VALUE;
 		
-		if (cachedStates.get(projectId).equals(State.FAILED) && !retryOnFail) {
+		if (State.FAILED.equals(cachedStates.get(projectId)) && !retryOnFail) {
 			
 			return v;
 		}

Modified: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/src/java/org/jboss/forge/jmm/service/impl/ScoresDailyUpdater.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/src/java/org/jboss/forge/jmm/service/impl/ScoresDailyUpdater.java	2006-12-22 22:37:30 UTC (rev 8567)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/src/java/org/jboss/forge/jmm/service/impl/ScoresDailyUpdater.java	2006-12-22 22:45:50 UTC (rev 8568)
@@ -35,7 +35,6 @@
 import org.jboss.annotation.ejb.TransactionTimeout;
 
 import org.jboss.forge.jmm.common.Constants;
-import org.jboss.forge.jmm.common.exceptions.ScoresException;
 import org.jboss.forge.jmm.common.protocol.ScoresService;
 import org.jboss.forge.jmm.common.protocol.conf.ScoresUpdater;
 import org.jboss.forge.jmm.common.protocol.conf.UpdatesConf;
@@ -71,15 +70,15 @@
 	@TransactionAttribute(value=TransactionAttributeType.REQUIRED)
 	@TransactionTimeout(value=3000)
     public void update(Timer timer) {
-		
-       log.info("Updating scores...");
-       
-       ScoresService scoresService = (ScoresService) timer.getInfo();
       
        try {
+    	   		log.info("Updating scores...");
+           
+    	   		ScoresService scoresService = (ScoresService) timer.getInfo();
+    	   
     	   		scoresService.save();
     	   
-       } catch (ScoresException e) {
+       } catch (Exception e) {
     	   
     	   		log.warn("Unable to update scores.\nCause: " + e.getMessage());
     	   		log.debug("Exception while updating scores:", e);