diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/Trie.java b/jetty-util/src/main/java/org/eclipse/jetty/util/Trie.java index b9412922c34..210f3365938 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/Trie.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/Trie.java @@ -119,7 +119,7 @@ public class Trie { char c=s.charAt(k); - int index=c>=0&&c<0x7f?__lookup[c]:-1; + int index=__lookup[c&0x7f]; if (index>=0) { int idx=t*ROW_SIZE+index; @@ -173,7 +173,7 @@ public class Trie for(int i=0; i < len; i++) { char c=s.charAt(i); - int index=c>=0&&c<0x7f?__lookup[c]:-1; + int index=__lookup[c&0x7f]; if (index>=0) { int idx=t*ROW_SIZE+index; @@ -207,7 +207,7 @@ public class Trie for(int i=0; i < len; i++) { byte c=b.get(offset+i); - int index=c>=0&&c<0x7f?__lookup[c]:-1; + int index=__lookup[c&0x7f]; if (index>=0) { int idx=t*ROW_SIZE+index; @@ -246,7 +246,7 @@ public class Trie for(int i=0; i < len; i++) { byte c=b[offset+i]; - int index=c>=0&&c<0x7f?__lookup[c]:-1; + int index=__lookup[c&0x7f]; if (index>=0) { int idx=t*ROW_SIZE+index; @@ -298,7 +298,7 @@ public class Trie for(int i=0; i < len; i++) { byte c=b.get(pos++); - int index=c>=0&&c<0x7f?__lookup[c]:-1; + int index=__lookup[c&0x7f]; if (index>=0) { int idx=t*ROW_SIZE+index; diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java b/jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java index b1b9cfddd22..2cf765e3daa 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java @@ -532,7 +532,7 @@ public class StdErrLog extends AbstractLogger { long now = System.currentTimeMillis(); int ms=(int)(now%1000); - String d = _dateCache.format(now); + String d = _dateCache.now(); tag(buffer,d,ms,level); format(buffer,msg,args); }