WICKET-6169 NullPointerException accessing AbstractRequestLogger.getLiveSessions
Fix some more candidates for the same problem. Remove implicit modifiers Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6966326f Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6966326f Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6966326f Branch: refs/heads/WICKET-6183 Commit: 6966326f05e6fcbc782568eaee073e389d53f191 Parents: 0a6a96b Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Sat May 21 13:11:29 2016 +0200 Committer: Andrea Del Bene <[email protected]> Committed: Fri May 27 13:12:16 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/wicket/protocol/http/IRequestLogger.java | 8 ++++---- .../wicket/protocol/http/AbstractRequestLoggerTest.java | 1 - .../java/org/apache/wicket/jmx/wrapper/ResourceSettings.java | 2 +- .../org/apache/wicket/protocol/ws/api/HttpSessionCopy.java | 2 +- .../wicket/protocol/ws/javax/JavaxUpgradeHttpRequest.java | 2 +- .../apache/wicket/spring/test/ApplicationContextMock.java | 2 +- .../main/java/org/apache/wicket/util/string/StringList.java | 2 +- 7 files changed, 9 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/6966326f/wicket-core/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java index acb91b1..36f0ca7 100644 --- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java +++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java @@ -163,14 +163,14 @@ public interface IRequestLogger /** * Perform the actual logging */ - public void performLogging(); + void performLogging(); /** * This class hold the information one request of a session has. * * @author jcompagner */ - public static class SessionData implements IClusterable, Comparable<SessionData> + class SessionData implements IClusterable, Comparable<SessionData> { private static final long serialVersionUID = 1L; @@ -304,7 +304,7 @@ public interface IRequestLogger * * @author jcompagner */ - public static class RequestData implements IClusterable + class RequestData implements IClusterable { private static final long serialVersionUID = 1L; @@ -560,7 +560,7 @@ public interface IRequestLogger * * @author jcompagner */ - public interface ISessionLogInfo + interface ISessionLogInfo { /** * If you use the request logger log functionality then this object should have a nice http://git-wip-us.apache.org/repos/asf/wicket/blob/6966326f/wicket-core/src/test/java/org/apache/wicket/protocol/http/AbstractRequestLoggerTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/AbstractRequestLoggerTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/AbstractRequestLoggerTest.java index a5bdc22..86ec61e 100644 --- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/AbstractRequestLoggerTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/AbstractRequestLoggerTest.java @@ -25,7 +25,6 @@ import org.junit.Test; */ public class AbstractRequestLoggerTest extends WicketTestCase { - private int counter; @Test http://git-wip-us.apache.org/repos/asf/wicket/blob/6966326f/wicket-jmx/src/main/java/org/apache/wicket/jmx/wrapper/ResourceSettings.java ---------------------------------------------------------------------- diff --git a/wicket-jmx/src/main/java/org/apache/wicket/jmx/wrapper/ResourceSettings.java b/wicket-jmx/src/main/java/org/apache/wicket/jmx/wrapper/ResourceSettings.java index b03de01..863804d 100644 --- a/wicket-jmx/src/main/java/org/apache/wicket/jmx/wrapper/ResourceSettings.java +++ b/wicket-jmx/src/main/java/org/apache/wicket/jmx/wrapper/ResourceSettings.java @@ -120,7 +120,7 @@ public class ResourceSettings implements ResourceSettingsMBean { list.add(loader.toString()); } - return list.toArray(new String[loaders.size()]); + return list.toArray(new String[0]); } return null; } http://git-wip-us.apache.org/repos/asf/wicket/blob/6966326f/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/HttpSessionCopy.java ---------------------------------------------------------------------- diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/HttpSessionCopy.java b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/HttpSessionCopy.java index 6423ab2..1b9da35 100644 --- a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/HttpSessionCopy.java +++ b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/HttpSessionCopy.java @@ -117,7 +117,7 @@ public class HttpSessionCopy implements HttpSession @Override public String[] getValueNames() { - return Collections.list(attributes.keys()).toArray(new String[attributes.size()]); + return Collections.list(attributes.keys()).toArray(new String[0]); } @Override http://git-wip-us.apache.org/repos/asf/wicket/blob/6966326f/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxUpgradeHttpRequest.java ---------------------------------------------------------------------- diff --git a/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxUpgradeHttpRequest.java b/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxUpgradeHttpRequest.java index 699337b..bf22062 100644 --- a/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxUpgradeHttpRequest.java +++ b/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxUpgradeHttpRequest.java @@ -87,7 +87,7 @@ public class JavaxUpgradeHttpRequest implements HttpServletRequest { String name = entry.getKey(); List<String> value = entry.getValue(); - parametersMap.put(name, value.toArray(new String[value.size()])); + parametersMap.put(name, value.toArray(new String[0])); } } } http://git-wip-us.apache.org/repos/asf/wicket/blob/6966326f/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java ---------------------------------------------------------------------- diff --git a/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java b/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java index 290ed61..cd3ad09 100644 --- a/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java +++ b/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java @@ -249,7 +249,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable @Override public String[] getBeanDefinitionNames() { - return beans.keySet().toArray(new String[beans.size()]); + return beans.keySet().toArray(new String[0]); } @Override http://git-wip-us.apache.org/repos/asf/wicket/blob/6966326f/wicket-util/src/main/java/org/apache/wicket/util/string/StringList.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/string/StringList.java b/wicket-util/src/main/java/org/apache/wicket/util/string/StringList.java index bc20076..e052cf8 100755 --- a/wicket-util/src/main/java/org/apache/wicket/util/string/StringList.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/string/StringList.java @@ -376,7 +376,7 @@ public final class StringList extends AbstractStringList @Override public String[] toArray() { - return strings.toArray(new String[size()]); + return strings.toArray(new String[0]); } /**
