You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2016/07/05 06:50:13 UTC
[1/2] camel git commit: CAMEL-10085
UnsafeUriCharactersEncoder.checkRAW compiles regex pattern every call
Repository: camel
Updated Branches:
refs/heads/camel-2.17.x e517bbd4a -> 1d6f7e603
CAMEL-10085 UnsafeUriCharactersEncoder.checkRAW compiles regex pattern every call
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1a3e086f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1a3e086f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1a3e086f
Branch: refs/heads/camel-2.17.x
Commit: 1a3e086ff85a53dc031c67bb4d0a40374b7eb6d7
Parents: e517bbd
Author: Marcin Lachowicz <Ma...@sabre.com>
Authored: Mon Jul 4 14:53:34 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Jul 5 08:47:23 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/util/UnsafeUriCharactersEncoder.java | 6 +++---
.../org/apache/camel/catalog/UnsafeUriCharactersEncoder.java | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1a3e086f/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java b/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
index 6ec9e63..3de44f9 100644
--- a/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
+++ b/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
@@ -32,6 +32,7 @@ public final class UnsafeUriCharactersEncoder {
private static BitSet unsafeCharactersHttp;
private static final char[] HEX_DIGITS = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C',
'D', 'E', 'F', 'a', 'b', 'c', 'd', 'e', 'f'};
+ private static Pattern RAW_PATTERN = Pattern.compile("RAW\\([^\\)]+\\)");
static {
unsafeCharactersRfc1738 = new BitSet(256);
@@ -92,10 +93,9 @@ public final class UnsafeUriCharactersEncoder {
public static String encodeHttpURI(String s, boolean checkRaw) {
return encode(s, unsafeCharactersHttp, checkRaw);
}
-
+
private static List<Pair> checkRAW(String s) {
- Pattern pattern = Pattern.compile("RAW\\([^\\)]+\\)");
- Matcher matcher = pattern.matcher(s);
+ Matcher matcher = RAW_PATTERN.matcher(s);
List<Pair> answer = new ArrayList<Pair>();
// Check all occurrences
while (matcher.find()) {
http://git-wip-us.apache.org/repos/asf/camel/blob/1a3e086f/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
index 2a58f3f..43f9674 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
@@ -32,6 +32,7 @@ public final class UnsafeUriCharactersEncoder {
private static BitSet unsafeCharactersHttp;
private static final char[] HEX_DIGITS = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C',
'D', 'E', 'F', 'a', 'b', 'c', 'd', 'e', 'f'};
+ private static Pattern RAW_PATTERN = Pattern.compile("RAW\\([^\\)]+\\)");
static {
unsafeCharactersRfc1738 = new BitSet(256);
@@ -94,8 +95,7 @@ public final class UnsafeUriCharactersEncoder {
}
private static List<Pair> checkRAW(String s) {
- Pattern pattern = Pattern.compile("RAW\\([^\\)]+\\)");
- Matcher matcher = pattern.matcher(s);
+ Matcher matcher = RAW_PATTERN.matcher(s);
List<Pair> answer = new ArrayList<Pair>();
// Check all occurrences
while (matcher.find()) {
[2/2] camel git commit: Fixed CS
Posted by ac...@apache.org.
Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1d6f7e60
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1d6f7e60
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1d6f7e60
Branch: refs/heads/camel-2.17.x
Commit: 1d6f7e603bbeeb16ae0746c0976ea972d22efd19
Parents: 1a3e086
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Jul 5 08:42:16 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Jul 5 08:47:35 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/util/UnsafeUriCharactersEncoder.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1d6f7e60/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java b/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
index 3de44f9..610876d 100644
--- a/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
+++ b/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
@@ -32,7 +32,7 @@ public final class UnsafeUriCharactersEncoder {
private static BitSet unsafeCharactersHttp;
private static final char[] HEX_DIGITS = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C',
'D', 'E', 'F', 'a', 'b', 'c', 'd', 'e', 'f'};
- private static Pattern RAW_PATTERN = Pattern.compile("RAW\\([^\\)]+\\)");
+ private static Pattern rawPattern = Pattern.compile("RAW\\([^\\)]+\\)");
static {
unsafeCharactersRfc1738 = new BitSet(256);
@@ -95,7 +95,7 @@ public final class UnsafeUriCharactersEncoder {
}
private static List<Pair> checkRAW(String s) {
- Matcher matcher = RAW_PATTERN.matcher(s);
+ Matcher matcher = rawPattern.matcher(s);
List<Pair> answer = new ArrayList<Pair>();
// Check all occurrences
while (matcher.find()) {