svn commit: r1625333 - in /syncope/trunk: ./ console/src/main/java/org/apache/syncope/console/commons/PreferenceManager.java console/src/main/java/org/apache/syncope/console/resources/WorkflowDefGETResource.java

[ilgrosso]

Author: ilgrosso
Date: Tue Sep 16 15:35:05 2014
New Revision: 1625333

URL: http://svn.apache.org/r1625333
Log:
[SYNCOPE-549] Merge from 1_2_X

Modified:
    syncope/trunk/   (props changed)
    
syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/PreferenceManager.java
    
syncope/trunk/console/src/main/java/org/apache/syncope/console/resources/WorkflowDefGETResource.java

Propchange: syncope/trunk/
------------------------------------------------------------------------------
  Merged /syncope/branches/1_2_X:r1625280-1625332

Modified: 
syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/PreferenceManager.java
URL: 
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/PreferenceManager.java?rev=1625333&r1=1625332&r2=1625333&view=diff
==============================================================================
--- 
syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/PreferenceManager.java
 (original)
+++ 
syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/PreferenceManager.java
 Tue Sep 16 15:35:05 2014
@@ -49,7 +49,7 @@ public class PreferenceManager {
 
     private static final int ONE_YEAR_TIME = 60 * 60 * 24 * 365;
 
-    private static final TypeReference MAP_TYPE_REF = new 
TypeReference<Map<String, String>>() {
+    private static final TypeReference<Map<String, String>> MAP_TYPE_REF = new 
TypeReference<Map<String, String>>() {
     };
 
     private static final List<Integer> PAGINATOR_CHOICES = Arrays.asList(new 
Integer[] { 10, 25, 50 });

Modified: 
syncope/trunk/console/src/main/java/org/apache/syncope/console/resources/WorkflowDefGETResource.java
URL: 
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/resources/WorkflowDefGETResource.java?rev=1625333&r1=1625332&r2=1625333&view=diff
==============================================================================
--- 
syncope/trunk/console/src/main/java/org/apache/syncope/console/resources/WorkflowDefGETResource.java
 (original)
+++ 
syncope/trunk/console/src/main/java/org/apache/syncope/console/resources/WorkflowDefGETResource.java
 Tue Sep 16 15:35:05 2014
@@ -35,9 +35,11 @@ public class WorkflowDefGETResource exte
 
     private static final long serialVersionUID = 4637304868056148970L;
 
+    
     @Override
     protected ResourceResponse newResourceResponse(final Attributes 
attributes) {
         ResourceResponse response = new ResourceResponse();
+        response.disableCaching();
         response.setContentType(MediaType.APPLICATION_JSON);
 
         response.setWriteCallback(new WriteCallback() {