LPS-56505 Retry on CME

xieh · Sep 5, 2015 · 1df9b84 · 1df9b84
1 parent b2c224f
commit 1df9b84
Showing 1 changed file with 27 additions and 16 deletions.
diff --git a/portal-service/src/com/liferay/portal/util/SessionClicks.java b/portal-service/src/com/liferay/portal/util/SessionClicks.java
@@ -23,6 +23,8 @@
 import com.liferay.portlet.PortalPreferences;
 import com.liferay.portlet.PortletPreferencesFactoryUtil;
 
+import java.util.ConcurrentModificationException;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
@@ -94,26 +96,35 @@ public static void put(
 			return;
 		}
 
-		try {
-			PortalPreferences preferences =
-				PortletPreferencesFactoryUtil.getPortalPreferences(request);
+		while (true) {
+			try {
+				PortalPreferences preferences =
+					PortletPreferencesFactoryUtil.getPortalPreferences(request);
 
-			int size = preferences.size();
+				int size = preferences.size();
 
-			if (size <= _SESSION_CLICKS_MAX_ALLOWED_VALUES) {
-				preferences.setValue(namespace, key, value);
-			}
-			else {
-				if (_log.isWarnEnabled()) {
-					_log.warn(
-						"Session clicks has attempted to exceed the maximum " +
-							"number of allowed values with {key=" + key +
-								", value=" + value + "}");
+				if (size <= _SESSION_CLICKS_MAX_ALLOWED_VALUES) {
+					preferences.setValue(namespace, key, value);
+				}
+				else {
+					if (_log.isWarnEnabled()) {
+						_log.warn(
+							"Session clicks has attempted to exceed the " +
+								"maximum number of allowed values with {key=" +
+									key + ", value=" + value + "}");
+					}
 				}
+
+				break;
+			}
+			catch (ConcurrentModificationException cme) {
+				continue;
+			}
+			catch (Exception e) {
+				_log.error(e, e);
+
+				break;
 			}
-		}
-		catch (Exception e) {
-			_log.error(e, e);
 		}
 	}