[jboss-svn-commits] JBL Code SVN: r7316 - in labs/shotoku/trunk: . shotoku-feeds/src/java/org/jboss/shotoku/feeds/service shotoku-feeds/src/java/org/jboss/shotoku/feeds/tools

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

Author: adamw
Date: 2006-11-02 07:31:36 -0500 (Thu, 02 Nov 2006)
New Revision: 7316

Modified:
   labs/shotoku/trunk/project.properties
   labs/shotoku/trunk/project.xml
   labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/service/FeedsServiceImpl.java
   labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tools/FeedsTools.java
Log:
Build fix

Modified: labs/shotoku/trunk/project.properties
===================================================================
--- labs/shotoku/trunk/project.properties	2006-11-02 10:13:44 UTC (rev 7315)
+++ labs/shotoku/trunk/project.properties	2006-11-02 12:31:36 UTC (rev 7316)
@@ -22,6 +22,7 @@
 maven.jar.jboss-jmx=${shotoku.root.dir}/lib/jboss/jboss-jmx.jar
 maven.jar.jboss-system=${shotoku.root.dir}/lib/jboss/jboss-system.jar
 maven.jar.jboss-common=${shotoku.root.dir}/lib/jboss/jboss-common.jar
+maven.jar.ejb3-persistence=${shotoku.root.dir}/lib/jboss/ejb3-persistence.jar
 
 maven.jar.standard=${shotoku.root.dir}/lib/taglibs/standard.jar
 maven.jar.jstl=${shotoku.root.dir}/lib/taglibs/jstl.jar

Modified: labs/shotoku/trunk/project.xml
===================================================================
--- labs/shotoku/trunk/project.xml	2006-11-02 10:13:44 UTC (rev 7315)
+++ labs/shotoku/trunk/project.xml	2006-11-02 12:31:36 UTC (rev 7316)
@@ -9,7 +9,7 @@
         <dependency>
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
-            <version>2.6.2</version>
+            <version>2.8.0</version>
         </dependency>
         <dependency>
             <groupId>xerces</groupId>
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>xalan</groupId>
             <artifactId>xalan</artifactId>
-            <version>2.6.0</version>
+            <version>2.7.0</version>
         </dependency>
 
         <dependency>

Modified: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/service/FeedsServiceImpl.java
===================================================================
--- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/service/FeedsServiceImpl.java	2006-11-02 10:13:44 UTC (rev 7315)
+++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/service/FeedsServiceImpl.java	2006-11-02 12:31:36 UTC (rev 7316)
@@ -20,6 +20,8 @@
 
 import javax.ejb.Local;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.HashMap;
+
 /**
  * @author Adam Warski (adamw at aster.pl)
  */
@@ -39,16 +41,11 @@
     @CacheItem
     private static FeedsConfigurationWatcher conf;
 
-    private ConcurrentHashMap<String, FeedsDescriptor> fds;
-    public static final Object synchronizer = new Object();
+    private HashMap<String, FeedsDescriptor> fds;
 
-    private FeedsDescriptor getFeedsDescriptor(String id) {
-        if (!fds.contains(id)) {
-            synchronized(synchronizer) {
-                if (!fds.contains(id)) {
-                    fds.put(id, new FeedsDescriptor(id, conf));
-                }
-            }
+    private synchronized FeedsDescriptor getFeedsDescriptor(String id) {
+        if (!fds.containsKey(id)) {
+            fds.put(id, new FeedsDescriptor(id, conf));
         }
 
         return fds.get(id);
@@ -90,7 +87,7 @@
 
         setTimerInterval(ContentManager.getProperty(
                 FeedsConstants.PROPERTY_INTERVAL, 10000));
-        fds = new ConcurrentHashMap<String, FeedsDescriptor>();
+        fds = new HashMap<String, FeedsDescriptor>();
 
         super.afterCreate();
     }

Modified: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tools/FeedsTools.java
===================================================================
--- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tools/FeedsTools.java	2006-11-02 10:13:44 UTC (rev 7315)
+++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tools/FeedsTools.java	2006-11-02 12:31:36 UTC (rev 7316)
@@ -95,7 +95,7 @@
     /**
      * @return An instance of the feeds service.
      */
-    public static FeedsService getService() {
+    public synchronized static FeedsService getService() {
         try {
             if (instance == null) {
                 if (ContentManager.isEmbedded()) {
@@ -123,7 +123,7 @@
     /**
      * @return An instance of the comments service.
      */
-    public static CommentsService getCommentsService() {
+    public synchronized static CommentsService getCommentsService() {
         try {
             if (commentsInstance == null) {
                 if (ContentManager.isEmbedded()) {