You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2011/10/21 03:02:31 UTC
svn commit: r1187147 - in
/myfaces/commons/branches/jsf_20/myfaces-commons-resourcehandler/src/main/java/org/apache/myfaces/commons/resourcehandler:
GZIPResourceLoader.java resource/ResourceHandlerCache.java
resource/ResourceLoaderUtils.java
Author: lu4242
Date: Fri Oct 21 01:02:30 2011
New Revision: 1187147
URL: http://svn.apache.org/viewvc?rev=1187147&view=rev
Log:
fix checkstyle bugs
Modified:
myfaces/commons/branches/jsf_20/myfaces-commons-resourcehandler/src/main/java/org/apache/myfaces/commons/resourcehandler/GZIPResourceLoader.java
myfaces/commons/branches/jsf_20/myfaces-commons-resourcehandler/src/main/java/org/apache/myfaces/commons/resourcehandler/resource/ResourceHandlerCache.java
myfaces/commons/branches/jsf_20/myfaces-commons-resourcehandler/src/main/java/org/apache/myfaces/commons/resourcehandler/resource/ResourceLoaderUtils.java
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-resourcehandler/src/main/java/org/apache/myfaces/commons/resourcehandler/GZIPResourceLoader.java
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-resourcehandler/src/main/java/org/apache/myfaces/commons/resourcehandler/GZIPResourceLoader.java?rev=1187147&r1=1187146&r2=1187147&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-resourcehandler/src/main/java/org/apache/myfaces/commons/resourcehandler/GZIPResourceLoader.java (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-resourcehandler/src/main/java/org/apache/myfaces/commons/resourcehandler/GZIPResourceLoader.java Fri Oct 21 01:02:30 2011
@@ -203,16 +203,7 @@ public class GZIPResourceLoader extends
if (creator == null)
{
- synchronized(this)
- {
- creator = map.get(identifier);
-
- if (creator == null)
- {
- creator = new FileProducer();
- map.put(identifier, creator);
- }
- }
+ creator = getOrCreateFileProducer(map, identifier);
}
if (!creator.isCreated())
@@ -221,7 +212,19 @@ public class GZIPResourceLoader extends
}
}
return file;
- }
+ }
+
+ private synchronized FileProducer getOrCreateFileProducer(Map<String, FileProducer> map, String identifier)
+ {
+ FileProducer creator = map.get(identifier);
+
+ if (creator == null)
+ {
+ creator = new FileProducer();
+ map.put(identifier, creator);
+ }
+ return creator;
+ }
private File getCompressedFile(ResourceMeta resourceMeta)
{
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-resourcehandler/src/main/java/org/apache/myfaces/commons/resourcehandler/resource/ResourceHandlerCache.java
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-resourcehandler/src/main/java/org/apache/myfaces/commons/resourcehandler/resource/ResourceHandlerCache.java?rev=1187147&r1=1187146&r2=1187147&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-resourcehandler/src/main/java/org/apache/myfaces/commons/resourcehandler/resource/ResourceHandlerCache.java (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-resourcehandler/src/main/java/org/apache/myfaces/commons/resourcehandler/resource/ResourceHandlerCache.java Fri Oct 21 01:02:30 2011
@@ -119,7 +119,8 @@ public class ResourceHandlerCache
//first, check to make sure that ProjectStage is production, if not, skip caching
if (!facesContext.isProjectStage(ProjectStage.Production))
{
- return _resourceCacheEnabled = Boolean.FALSE;
+ _resourceCacheEnabled = Boolean.FALSE;
+ return _resourceCacheEnabled;
}
ExternalContext externalContext = facesContext.getExternalContext();
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-resourcehandler/src/main/java/org/apache/myfaces/commons/resourcehandler/resource/ResourceLoaderUtils.java
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-resourcehandler/src/main/java/org/apache/myfaces/commons/resourcehandler/resource/ResourceLoaderUtils.java?rev=1187147&r1=1187146&r2=1187147&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-resourcehandler/src/main/java/org/apache/myfaces/commons/resourcehandler/resource/ResourceLoaderUtils.java (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-resourcehandler/src/main/java/org/apache/myfaces/commons/resourcehandler/resource/ResourceLoaderUtils.java Fri Oct 21 01:02:30 2011
@@ -40,14 +40,14 @@ public class ResourceLoaderUtils
"EEE, dd MMM yyyy HH:mm:ss zzz", "EEEEEE, dd-MMM-yy HH:mm:ss zzz",
"EEE MMMM d HH:mm:ss yyyy" };
- private static TimeZone __GMT = TimeZone.getTimeZone("GMT");
+ private static TimeZone gmt = TimeZone.getTimeZone("GMT");;
public static String formatDateHeader(long value)
{
SimpleDateFormat format = new SimpleDateFormat(
HTTP_RESPONSE_DATE_HEADER,
Locale.US);
- format.setTimeZone(__GMT);
+ format.setTimeZone(gmt);
return format.format(new Date(value));
}
@@ -60,7 +60,7 @@ public class ResourceLoaderUtils
{
SimpleDateFormat format = new SimpleDateFormat(
HTTP_REQUEST_DATE_HEADER[i], Locale.US);
- format.setTimeZone(__GMT);
+ format.setTimeZone(gmt);
date = format.parse(value);
}
catch (ParseException e)