Author: taylor
Date: Sat Jul 12 20:23:11 2014
New Revision: 1610040
URL: http://svn.apache.org/r1610040
Log:
JS2-1284: backporting changes to 2.2.3 from trunk
Modified:
portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/components/jetspeed-cm/src/main/java/org/apache/jetspeed/cache/impl/EhCacheDistributedImpl.java
portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java
Modified: portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/components/jetspeed-cm/src/main/java/org/apache/jetspeed/cache/impl/EhCacheDistributedImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/components/jetspeed-cm/src/main/java/org/apache/jetspeed/cache/impl/EhCacheDistributedImpl.java?rev=1610040&r1=1610039&r2=1610040&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/components/jetspeed-cm/src/main/java/org/apache/jetspeed/cache/impl/EhCacheDistributedImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/components/jetspeed-cm/src/main/java/org/apache/jetspeed/cache/impl/EhCacheDistributedImpl.java Sat Jul 12 20:23:11 2014
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -135,7 +135,7 @@ public class EhCacheDistributedImpl exte
return ehcache.removeQuiet(key);
}
-
+
public void clear()
{
// invoke removeAll with local flag set
@@ -155,7 +155,7 @@ public class EhCacheDistributedImpl exte
else
remoteListeners.add(listener);
}
-
+
public void removeEventListener(JetspeedCacheEventListener listener, boolean local)
{
if (local)
@@ -163,7 +163,7 @@ public class EhCacheDistributedImpl exte
else
remoteListeners.remove(listener);
}
-
+
public void evictContentForUser(RequestContext context)
{
return;
@@ -178,7 +178,7 @@ public class EhCacheDistributedImpl exte
{
return null;
}
-
+
public void dispose()
{
if (refList != null)
@@ -187,14 +187,14 @@ public class EhCacheDistributedImpl exte
refList = null;
temp.clear();
}
- else
+ else
return;
if (this.ehcache != null)
{
ehcache = null;
}
}
-
+
protected void notifyListeners(boolean local, int action, Object key, Object value)
{
List listeners = (local?localListeners:remoteListeners);
@@ -226,9 +226,9 @@ public class EhCacheDistributedImpl exte
{
e.printStackTrace();
}
- }
+ }
}
-
+
public void notifyElement( Ehcache cache, boolean local,Element arg1, int action)
{
if (cache != this.ehcache)
@@ -245,7 +245,7 @@ public class EhCacheDistributedImpl exte
if (action < 0)
refList.remove(arg1.getKey());
else if (action == CacheElement.ActionAdded)
- refList.put(arg1.getKey(), arg1);
+ refList.put(arg1.getKey(), new EhCacheDistributedElementImpl(arg1));
e.notifyChange(action);
notifyListeners(local, action, arg1.getKey(), arg1.getObjectValue());
}
Modified: portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java?rev=1610040&r1=1610039&r2=1610040&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java Sat Jul 12 20:23:11 2014
@@ -17,17 +17,6 @@
package org.apache.jetspeed.aggregator.impl;
-import java.security.AccessControlContext;
-import java.security.PrivilegedAction;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.portlet.UnavailableException;
-import javax.security.auth.Subject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.jetspeed.aggregator.PortletContent;
import org.apache.jetspeed.aggregator.PortletRenderer;
import org.apache.jetspeed.aggregator.PortletTrackingManager;
@@ -44,6 +33,16 @@ import org.apache.pluto.container.Portle
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.portlet.UnavailableException;
+import javax.security.auth.Subject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.security.AccessControlContext;
+import java.security.PrivilegedAction;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* The RenderingJob is responsible for storing all necessary objets for
* asynchronous portlet rendering as well as implementing the rendering logic
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.