[jboss-svn-commits] JBL Code SVN: r5230 - in labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service: . impl

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

Author: wrzep
Date: 2006-07-21 17:54:58 -0400 (Fri, 21 Jul 2006)
New Revision: 5230

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/DBService.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBScoresRepositoryManager.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBServiceImpl.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ServiceScoresManager.java
Log:
JBLAB-689
Bug fix - empty DB caused RuntimeException.

Pawel


Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/DBService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/DBService.java	2006-07-21 21:49:15 UTC (rev 5229)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/DBService.java	2006-07-21 21:54:58 UTC (rev 5230)
@@ -30,8 +30,6 @@
 * @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com)
 */
 public interface DBService {
-		
-	public void init();
 	
 	public void save(PluginsValues pluginsValues);
 	

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBScoresRepositoryManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBScoresRepositoryManager.java	2006-07-21 21:49:15 UTC (rev 5229)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBScoresRepositoryManager.java	2006-07-21 21:54:58 UTC (rev 5230)
@@ -54,12 +54,24 @@
 	
 	public void save(PluginsValues pluginsValues) throws ScoresSaveException {
 	
-		service.save(pluginsValues);
+		try {
+			service.save(pluginsValues);
+		} catch (Exception e) {
+			throw new ScoresSaveException(e);
+		}
 	}
 
 	public PluginsValues get(Calendar cal) throws GetScoresException {
 		
-		return service.get(cal);
+		PluginsValues pv = null;
+		
+		try {
+			pv = service.get(cal);
+		} catch (Exception e) {
+			throw new GetScoresException(e);
+		}
+		
+		return pv;
 	}
 
 	private DBService getService() throws NamingException {
@@ -73,8 +85,6 @@
 		DBService service = 
 			(DBService) PortableRemoteObject.narrow( ref, DBService.class);
 		
-		service.init();
-		
 		return service;
 	}
 }

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBServiceImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBServiceImpl.java	2006-07-21 21:49:15 UTC (rev 5229)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBServiceImpl.java	2006-07-21 21:54:58 UTC (rev 5230)
@@ -26,13 +26,11 @@
 import java.util.List;
 
 import javax.ejb.Local;
-import javax.ejb.Stateful;
+import javax.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
 
-import static javax.persistence.PersistenceContextType.EXTENDED;
-
 import org.jboss.annotation.ejb.LocalBinding;
 
 import org.jboss.forge.status.common.Constants;
@@ -44,15 +42,13 @@
 * @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com)
 */
 
- at Stateful
+ at Stateless
 @Local(DBService.class)
 @LocalBinding(jndiBinding=Constants.DB_SERVICE)
 public class DBServiceImpl implements DBService {
 
-	@PersistenceContext (unitName="scores", type=EXTENDED)
+	@PersistenceContext (unitName="scores")
     protected EntityManager em;
-
-	public void init() {}
 	
 	public void save(PluginsValues pluginsValues) {
 		

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ServiceScoresManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ServiceScoresManager.java	2006-07-21 21:49:15 UTC (rev 5229)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ServiceScoresManager.java	2006-07-21 21:54:58 UTC (rev 5230)
@@ -99,7 +99,7 @@
 			save(projects, pluginsConf);
 			log.info("Finished async save.");
 		} catch (ScoresSaveException e) {
-			log.warn("Async saving scores failed.");
+			log.warn("Async saving scores failed.", e);
 		}
 	}