Updated Branches: refs/heads/master 92357f2c2 -> 33926603a
WICKET-4422 Minimize Wicket's Ajax JavaScript files at build time Improve the name of a local variable Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/33926603 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/33926603 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/33926603 Branch: refs/heads/master Commit: 33926603a688afe64fe280612996e26beb8f2b7b Parents: 92357f2 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu Feb 23 11:30:50 2012 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu Feb 23 11:30:50 2012 +0100 ---------------------------------------------------------------------- .../request/resource/PackageResourceReference.java | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/33926603/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java index 9d60aab..90ae92e 100644 --- a/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java +++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java @@ -172,10 +172,10 @@ public class PackageResourceReference extends ResourceReference */ private String internalGetMinifiedName() { - String minifiedExists = MINIFIED_NAMES_CACHE.get(this); - if (minifiedExists != null && minifiedExists != NO_MINIFIED_NAME) + String minifiedName = MINIFIED_NAMES_CACHE.get(this); + if (minifiedName != null && minifiedName != NO_MINIFIED_NAME) { - return minifiedExists; + return minifiedName; } String name = getMinifiedName(); @@ -186,14 +186,14 @@ public class PackageResourceReference extends ResourceReference IResourceStream stream = locator.locate(getScope(), absolutePath, getStyle(), getVariation(), getLocale(), null, true); - minifiedExists = stream != null ? name : NO_MINIFIED_NAME; - MINIFIED_NAMES_CACHE.put(this, minifiedExists); - if (minifiedExists == NO_MINIFIED_NAME && log.isDebugEnabled()) + minifiedName = stream != null ? name : NO_MINIFIED_NAME; + MINIFIED_NAMES_CACHE.put(this, minifiedName); + if (minifiedName == NO_MINIFIED_NAME && log.isDebugEnabled()) { log.debug("No minified version of '" + super.getName() + "' found, expected a file with the name '" + name + "', using full version"); } - return minifiedExists; + return minifiedName; } /**
