[ajax4jsf-svn-commits] JBoss Ajax4JSF SVN: r192 - trunk/framework/src/main/java/org/ajax4jsf/framework/resource.

[ajax4jsf-svn-commits at lists.jboss.org]

Author: alexsmirnov
Date: 2007-05-14 18:39:06 -0400 (Mon, 14 May 2007)
New Revision: 192

Modified:
   trunk/framework/src/main/java/org/ajax4jsf/framework/resource/ResourceBuilderImpl.java
   trunk/framework/src/main/java/org/ajax4jsf/framework/resource/UserResource.java
Log:
fix AJSF-57 ( hidde attributes )
AJSF-60 Memory leak at the resource data encrypt/decript.
AJSF-61  	 Fix expires/last modified caching control for a resources renderer

Modified: trunk/framework/src/main/java/org/ajax4jsf/framework/resource/ResourceBuilderImpl.java
===================================================================
--- trunk/framework/src/main/java/org/ajax4jsf/framework/resource/ResourceBuilderImpl.java	2007-05-14 22:37:42 UTC (rev 191)
+++ trunk/framework/src/main/java/org/ajax4jsf/framework/resource/ResourceBuilderImpl.java	2007-05-14 22:39:06 UTC (rev 192)
@@ -559,6 +559,7 @@
 	    int totalOut = compressor.deflate(compressed);
 	    byte[] zipsrc = new byte[totalOut];
 	    System.arraycopy(compressed, 0, zipsrc, 0, totalOut);
+	    compressor.end();
 	    return codec.encode(zipsrc);
 	} catch (Exception e) {
 	    throw new FacesException("Error encode resource data", e);
@@ -572,9 +573,9 @@
 	    byte[] uncompressed = new byte[zipsrc.length * 5];
 	    decompressor.setInput(zipsrc);
 	    int totalOut = decompressor.inflate(uncompressed);
-	    decompressor.end();
 	    byte[] out = new byte[totalOut];
 	    System.arraycopy(uncompressed, 0, out, 0, totalOut);
+	    decompressor.end();
 	    return out;
 	} catch (Exception e) {
 	    throw new FacesException("Error decode resource data", e);

Modified: trunk/framework/src/main/java/org/ajax4jsf/framework/resource/UserResource.java
===================================================================
--- trunk/framework/src/main/java/org/ajax4jsf/framework/resource/UserResource.java	2007-05-14 22:37:42 UTC (rev 191)
+++ trunk/framework/src/main/java/org/ajax4jsf/framework/resource/UserResource.java	2007-05-14 22:39:06 UTC (rev 192)
@@ -79,7 +79,7 @@
 					dataToStore.expires = UIComponentBase.saveAttachedState(context,expires);
 				}
 				ValueBinding lastModified = component.getValueBinding("lastModified");
-				if (null != expires) {
+				if (null != lastModified) {
 					dataToStore.modified = UIComponentBase.saveAttachedState(context,lastModified);
 				}
 			}