WICKET-5535 Intern strings generated by Wicket that have bigger chance to be duplicated
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7054ccc0 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7054ccc0 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7054ccc0 Branch: refs/heads/master Commit: 7054ccc08e29553da06b0d73dba5ff18e754a39b Parents: 6f8c888 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Mar 18 17:58:20 2014 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Mar 18 17:58:20 2014 +0200 ---------------------------------------------------------------------- .../org/apache/wicket/application/WildcardMatcherHelper.java | 3 ++- .../wicket/markup/html/navigation/paging/PagingNavigation.java | 6 +++--- .../src/main/java/org/apache/wicket/mock/MockWebResponse.java | 2 +- .../resource/caching/version/LastModifiedResourceVersion.java | 2 +- .../markup/html/repeater/data/table/NavigationToolbar.java | 2 +- .../markup/html/repeater/data/table/NoRecordsToolbar.java | 2 +- .../markup/html/repeater/data/table/export/ExportToolbar.java | 2 +- 7 files changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/7054ccc0/wicket-core/src/main/java/org/apache/wicket/application/WildcardMatcherHelper.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/application/WildcardMatcherHelper.java b/wicket-core/src/main/java/org/apache/wicket/application/WildcardMatcherHelper.java index 148909d..a1edc2d 100644 --- a/wicket-core/src/main/java/org/apache/wicket/application/WildcardMatcherHelper.java +++ b/wicket-core/src/main/java/org/apache/wicket/application/WildcardMatcherHelper.java @@ -181,7 +181,8 @@ public class WildcardMatcherHelper */ private void add(final String aStr) { - map.put(String.valueOf(idx++), aStr); + String key = String.valueOf(idx++).intern(); + map.put(key, aStr); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/7054ccc0/wicket-core/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java index b498f09..cce7c63 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java @@ -287,7 +287,7 @@ public class PagingNavigation extends Loop } else { - label = String.valueOf(pageIndex + 1); + label = String.valueOf(pageIndex + 1).intern(); } link.add(new Label("pageNumber", label)); } @@ -422,8 +422,8 @@ public class PagingNavigation extends Loop @Override public void onComponentTag(Component component, ComponentTag tag) { - Map<String, String> vars = new MicroMap<String, String>("page", - String.valueOf(page + 1)); + String pageIndex = String.valueOf(page + 1).intern(); + Map<String, String> vars = new MicroMap<String, String>("page", pageIndex); tag.put("title", PagingNavigation.this.getString(RES, Model.ofMap(vars))); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/7054ccc0/wicket-core/src/main/java/org/apache/wicket/mock/MockWebResponse.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/mock/MockWebResponse.java b/wicket-core/src/main/java/org/apache/wicket/mock/MockWebResponse.java index 6ac2c28..ba09a16 100644 --- a/wicket-core/src/main/java/org/apache/wicket/mock/MockWebResponse.java +++ b/wicket-core/src/main/java/org/apache/wicket/mock/MockWebResponse.java @@ -119,7 +119,7 @@ public class MockWebResponse extends WebResponse public void setContentLength(long length) { contentLength = length; - setHeader("Content-Length", String.valueOf(length)); + setHeader("Content-Length", String.valueOf(length).intern()); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/7054ccc0/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/LastModifiedResourceVersion.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/LastModifiedResourceVersion.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/LastModifiedResourceVersion.java index dcdbc6c..1ba8de2 100644 --- a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/LastModifiedResourceVersion.java +++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/LastModifiedResourceVersion.java @@ -57,7 +57,7 @@ public class LastModifiedResourceVersion implements IResourceVersion return null; } // version string = last modified timestamp converted to milliseconds - return String.valueOf(lastModified.getMilliseconds()); + return String.valueOf(lastModified.getMilliseconds()).intern(); } @Override http://git-wip-us.apache.org/repos/asf/wicket/blob/7054ccc0/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java index 58b7801..83aad70 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java @@ -51,7 +51,7 @@ public class NavigationToolbar extends AbstractToolbar @Override public String getObject() { - return String.valueOf(table.getColumns().size()); + return String.valueOf(table.getColumns().size()).intern(); } })); http://git-wip-us.apache.org/repos/asf/wicket/blob/7054ccc0/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java index bdb5410..ff06af0 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java @@ -72,7 +72,7 @@ public class NoRecordsToolbar extends AbstractToolbar @Override public String getObject() { - return String.valueOf(table.getColumns().size()); + return String.valueOf(table.getColumns().size()).intern(); } })); td.add(new Label("msg", messageModel)); http://git-wip-us.apache.org/repos/asf/wicket/blob/7054ccc0/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/export/ExportToolbar.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/export/ExportToolbar.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/export/ExportToolbar.java index 2fbf6cf..4c0facb 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/export/ExportToolbar.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/export/ExportToolbar.java @@ -170,7 +170,7 @@ public class ExportToolbar extends AbstractToolbar @Override public String getObject() { - return String.valueOf(getTable().getColumns().size()); + return String.valueOf(getTable().getColumns().size()).intern(); } }));
