Update of
/var/cvs/contributions/CMSContainer_Modules/directreaction/src/java/com/finalist/cmsc/resources/forms
In directory
james.mmbase.org:/tmp/cvs-serv10328/directreaction/src/java/com/finalist/cmsc/resources/forms
Modified Files:
ReactionAction.java
Log Message:
CMSC-1064 Reduce mmapps.CloudProvider usage
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/directreaction/src/java/com/finalist/cmsc/resources/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1064
Index: ReactionAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/directreaction/src/java/com/finalist/cmsc/resources/forms/ReactionAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ReactionAction.java 1 Aug 2008 14:47:49 -0000 1.5
+++ ReactionAction.java 10 Sep 2008 12:36:37 -0000 1.6
@@ -5,9 +5,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.sf.mmapps.modules.cloudprovider.CloudProvider;
-import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
-
import org.apache.struts.action.*;
import org.mmbase.bridge.*;
import org.mmbase.storage.search.RelationStep;
@@ -15,7 +12,7 @@
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
-import com.finalist.cmsc.services.publish.Publish;
+import com.finalist.cmsc.navigation.ServerUtil;
public class ReactionAction extends SearchAction {
@@ -54,18 +51,10 @@
@Override
public Cloud getCloud() {
- CloudProvider cloudProvider = CloudProviderFactory.getCloudProvider();
- Cloud cloud = cloudProvider.getCloud();
-
/* The DirectReactions should use the staging cloud if we are
* running in single-war-file mode.
*/
- try{
- Cloud remoteCloud = Publish.getRemoteCloud(cloud);
- return remoteCloud; //In case there is a live.server
- } catch(NoClassDefFoundError e){
- return cloud; //In case there is only a staging
(single) server
- }
+ return getCloudForAnonymousUpdate(ServerUtil.isLive());
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
