Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
In directory james.mmbase.org:/tmp/cvs-serv6464

Modified Files:
        CloudTag.java 
Log Message:
cannot set non-serializalbe object on remote clouds


See also: 
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib


Index: CloudTag.java
===================================================================
RCS file: 
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/CloudTag.java,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -b -r1.158 -r1.159
--- CloudTag.java       13 Jun 2008 13:35:12 -0000      1.158
+++ CloudTag.java       16 Jul 2008 11:02:43 -0000      1.159
@@ -38,7 +38,7 @@
  * @author Pierre van Rooden
  * @author Michiel Meeuwissen
  * @author Vincent van der Locht
- * @version $Id: CloudTag.java,v 1.158 2008/06/13 13:35:12 michiel Exp $
+ * @version $Id: CloudTag.java,v 1.159 2008/07/16 11:02:43 michiel Exp $
  */
 
 public class CloudTag extends ContextReferrerTag implements CloudProvider, 
ParamHandler {
@@ -111,6 +111,7 @@
     public  CloudContext getDefaultCloudContext() throws JspTagException {
         if (cloudContext == null) {
             cloudContext = 
ContextProvider.getCloudContext(cloudURI.getString(this));
+            if (cloudContext == null) throw new 
RuntimeException("ContextProvider gave <code>null</code> for " + 
cloudURI.getString(this));
         }
         return cloudContext;
     }
@@ -213,7 +214,8 @@
 
     protected int getMethod() throws JspTagException {
         String m = method.getString(this);
-        int r =  cloudContext.getAuthentication().getMethod(m);
+        AuthenticationData data = getDefaultCloudContext().getAuthentication();
+        int r =  data == null ? -1 : data.getMethod(m);
         if (log.isDebugEnabled()) {
             log.debug("method '" + m + "' -> " + r);
         }
@@ -512,7 +514,9 @@
         }
         pageContext.setAttribute(KEY, cloud, SCOPE);
 
+        if (cloud.getCloudContext() instanceof LocalContext) {
         cloud.setProperty("request", request);
+        }
         cloud.setProperty(LocaleTag.TZ_KEY, getTimeZone());
 
         if (jspVar != null) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to