You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2018/09/17 18:01:06 UTC
wicket git commit: WICKET-6589 guard parsing failure
Repository: wicket
Updated Branches:
refs/heads/wicket-8.x 33a97332f -> 11fcc6e66
WICKET-6589 guard parsing failure
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/11fcc6e6
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/11fcc6e6
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/11fcc6e6
Branch: refs/heads/wicket-8.x
Commit: 11fcc6e66e75304763e4a787452f1f61ab207d0e
Parents: 33a9733
Author: Sven Meier <sv...@apache.org>
Authored: Mon Sep 17 18:02:50 2018 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Mon Sep 17 19:40:25 2018 +0200
----------------------------------------------------------------------
.../wicket/protocol/http/request/WebClientInfo.java | 5 +++--
.../protocol/http/request/WebClientInfoTest.java | 16 ++++++++++++++++
2 files changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/11fcc6e6/wicket-core/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java
index c0fb2a6..8b48270 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java
@@ -28,6 +28,7 @@ import org.apache.wicket.markup.html.pages.BrowserInfoPage;
import org.apache.wicket.protocol.http.ClientProperties;
import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.util.string.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -350,8 +351,8 @@ public class WebClientInfo extends ClientInfo
if (matcher.find())
{
- properties.setBrowserVersionMajor(Integer.parseInt(matcher.group(1)));
- properties.setBrowserVersionMinor(Integer.parseInt(matcher.group(2)));
+ properties.setBrowserVersionMajor(StringValue.valueOf(matcher.group(1)).toInt(-1));
+ properties.setBrowserVersionMinor(StringValue.valueOf(matcher.group(2)).toInt(-1));
}
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/11fcc6e6/wicket-core/src/test/java/org/apache/wicket/protocol/http/request/WebClientInfoTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/request/WebClientInfoTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/request/WebClientInfoTest.java
index 11a7db2..10ed68d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/request/WebClientInfoTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/request/WebClientInfoTest.java
@@ -833,6 +833,22 @@ public class WebClientInfoTest
}
/**
+ * WICKET-6589
+ */
+ @Test
+ public void firefoxIntegerExceeded()
+ {
+ String userAgent = "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:50.0) Gecko/20100101 Firefox/50.01537112190982";
+ WebClientInfo webClientInfo = new WebClientInfo(requestCycleMock, userAgent);
+
+ assertThat(userAgent, webClientInfo.getProperties().getBrowserVersionMajor(),
+ is(equalTo(50)));
+ assertThat(userAgent, webClientInfo.getProperties().getBrowserVersionMinor(),
+ is(equalTo(-1)));
+ }
+
+
+ /**
* Test Microsoft Edge user-agent strings
*/
@Test