You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gc...@apache.org on 2011/03/18 21:03:06 UTC
svn commit: r1083033 -
/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
Author: gcrawford
Date: Fri Mar 18 20:03:05 2011
New Revision: 1083033
URL: http://svn.apache.org/viewvc?rev=1083033&view=rev
Log:
TRINIDAD-2052 Native memory issue Defltaer/inflater from StateManagerImpl
Modified:
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java?rev=1083033&r1=1083032&r2=1083033&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java Fri Mar 18 20:03:05 2011
@@ -55,12 +55,12 @@ import org.apache.myfaces.trinidad.conte
import org.apache.myfaces.trinidad.context.WindowManager;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
import org.apache.myfaces.trinidad.util.ExternalContextUtils;
-import org.apache.myfaces.trinidad.util.TransientHolder;
import org.apache.myfaces.trinidadinternal.context.RequestContextImpl;
import org.apache.myfaces.trinidadinternal.context.TrinidadPhaseListener;
+import org.apache.myfaces.trinidadinternal.util.ObjectInputStreamResolveClass;
import org.apache.myfaces.trinidadinternal.util.SubKeyMap;
import org.apache.myfaces.trinidadinternal.util.TokenCache;
-import org.apache.myfaces.trinidadinternal.util.ObjectInputStreamResolveClass;
+
/**
* StateManager that handles a hybrid client/server strategy: the state
@@ -1346,26 +1346,10 @@ public class StateManagerImpl extends St
private Object _unzipBytes(FacesContext context, byte[] zippedBytes)
{
- Inflater decompressor = null;
- ExternalContext externalContext = context.getExternalContext();
- Map<String,Object> sessionMap = externalContext.getSessionMap();
+ Inflater decompressor = new Inflater();
try
{
- //Get inflater from session cope
- TransientHolder<Inflater> th =
- (TransientHolder<Inflater>)sessionMap.remove("PAGE_STATE_INFLATER");
-
- if (th != null)
- {
- decompressor = th.getValue();
- }
-
- if(decompressor == null)
- {
- decompressor = new Inflater();
- }
-
decompressor.setInput(zippedBytes);
ByteArrayOutputStream bos = new ByteArrayOutputStream(zippedBytes.length);
byte[] buf = new byte[zippedBytes.length*5];
@@ -1399,38 +1383,16 @@ public class StateManagerImpl extends St
}
finally
{
- //Reset and put back
- if(decompressor != null)
- {
- decompressor.reset();
- decompressor.setInput(_EMPTY);
- TransientHolder<Inflater> th = TransientHolder.newTransientHolder(decompressor);
- sessionMap.put("PAGE_STATE_INFLATER", th);
- }
+ decompressor.end();
}
}
private void _zipToBytes(FacesContext context, Object state)
{
- Deflater compresser = null;
- ExternalContext externalContext = context.getExternalContext();
- Map<String,Object> sessionMap = externalContext.getSessionMap();
+ Deflater compresser = new Deflater(Deflater.BEST_SPEED);
try
{
- //Get deflater from session scope
- TransientHolder<Deflater> th =
- (TransientHolder<Deflater>)sessionMap.remove("PAGE_STATE_DEFLATER");
-
- if (th != null)
- {
- compresser = th.getValue();
- }
-
- if(compresser == null)
- {
- compresser = new Deflater(Deflater.BEST_SPEED);
- }
//Serialize state
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -1462,14 +1424,7 @@ public class StateManagerImpl extends St
}
finally
{
- //Reset and put back
- if(compresser != null)
- {
- compresser.reset();
- compresser.setInput(_EMPTY);
- TransientHolder<Deflater> th = TransientHolder.newTransientHolder(compresser);
- sessionMap.put("PAGE_STATE_DEFLATER", th);
- }
+ compresser.end();
}
}
}
@@ -1524,7 +1479,5 @@ public class StateManagerImpl extends St
private static final String _ACTIVE_PAGE_TOKEN_SESSION_KEY =
"org.apache.myfaces.trinidadinternal.application.StateManagerImp.ACTIVE_PAGE_STATE";
- private static final byte[] _EMPTY = new byte[0];
-
private static final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(StateManagerImpl.class);
}