Author: markt
Date: Sat Nov 7 22:38:55 2015
New Revision: 1713194
URL: http://svn.apache.org/viewvc?rev=1713194&view=rev
Log:
Remove unused constant.
Reported by UC Detector
Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/ByteBufferHolder.java
tomcat/trunk/java/org/apache/tomcat/util/buf/ByteBufferUtils.java
tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java
tomcat/trunk/java/org/apache/tomcat/util/threads/Constants.java
tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicDigestAuthenticator.java
tomcat/trunk/test/org/apache/tomcat/util/buf/TestUEncoder.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/ByteBufferHolder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/ByteBufferHolder.java?rev=1713194&r1=1713193&r2=1713194&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/ByteBufferHolder.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/ByteBufferHolder.java Sat Nov
7 22:38:55 2015
@@ -52,13 +52,4 @@ public class ByteBufferHolder {
return false;
}
}
-
-
- public boolean hasData() {
- if (flipped.get()) {
- return buf.remaining()>0;
- } else {
- return buf.position()>0;
- }
- }
}
\ No newline at end of file
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/ByteBufferUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/ByteBufferUtils.java?rev=1713194&r1=1713193&r2=1713194&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/ByteBufferUtils.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/ByteBufferUtils.java Sat Nov
7 22:38:55 2015
@@ -45,20 +45,6 @@ public class ByteBufferUtils {
/**
- * Default byte buffer expansion. Doubles current size. Buffers are assumed
- * to be in 'write to' mode since there would be no need to expand a buffer
- * while it was in 'read from' mode.
- *
- * @param in Buffer to expand
- * @return The expanded buffer with any data from the input buffer copied
- * in to it
- */
- public static ByteBuffer expand(ByteBuffer in) {
- return expand(in, in.capacity() * 2);
- }
-
-
- /**
* Expands buffer to the given size unless it is already as big or bigger.
* Buffers are assumed to be in 'write to' mode since there would be no
need
* to expand a buffer while it was in 'read from' mode.
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java?rev=1713194&r1=1713193&r2=1713194&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java Sat Nov 7
22:38:55 2015
@@ -142,7 +142,6 @@ public final class ByteChunk implements
* Resets the message buff to an uninitialized state.
*/
public void recycle() {
- // buff = null;
charset=null;
start=0;
end=0;
@@ -150,10 +149,6 @@ public final class ByteChunk implements
hasHashCode = false;
}
- public void reset() {
- buff=null;
- }
-
// -------------------- Setup --------------------
public void allocate( int initial, int limit ) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java?rev=1713194&r1=1713193&r2=1713194&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java Sat Nov 7
22:38:55 2015
@@ -56,36 +56,16 @@ public final class UEncoder {
private ByteChunk bb=null;
private CharChunk cb=null;
private CharChunk output=null;
- private final boolean readOnlySafeChars;
-
- public UEncoder() {
- this.safeChars = initialSafeChars();
- readOnlySafeChars = false;
- }
/**
* Create a UEncoder with an unmodifiable safe character set.
- * <p>
- * Calls to {@link UEncoder#addSafeCharacter(char) addSafeCharacter(char)}
- * on instances created by this constructor will throw an
- * {@link IllegalStateException}.
*
- * @param safeCharsSet
- * safe characters for this encoder
+ * @param safeCharsSet safe characters for this encoder
*/
public UEncoder(SafeCharsSet safeCharsSet) {
this.safeChars = safeCharsSet.getSafeChars();
- readOnlySafeChars = true;
}
- public void addSafeCharacter( char c ) {
- if (readOnlySafeChars) {
- throw new IllegalStateException("UEncoders safeChararacters are
read only");
- }
- safeChars.set( c );
- }
-
-
/**
* URL Encode string, using a specified encoding.
*
Modified: tomcat/trunk/java/org/apache/tomcat/util/threads/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/threads/Constants.java?rev=1713194&r1=1713193&r2=1713194&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/threads/Constants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/threads/Constants.java Sat Nov 7
22:38:55 2015
@@ -21,8 +21,6 @@ package org.apache.tomcat.util.threads;
*/
public final class Constants {
- public static final String Package = "org.apache.tomcat.util.threads";
-
public static final long DEFAULT_THREAD_RENEWAL_DELAY = 1000L;
/**
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java?rev=1713194&r1=1713193&r2=1713194&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
Sat Nov 7 22:38:55 2015
@@ -245,7 +245,6 @@ public class TestDigestAuthenticator ext
// Third request should succeed if we increment nc
auth.clear();
bc.recycle();
- bc.reset();
auth.add(buildDigestResponse(user, pwd, digestUri, realm,
getNonce(respHeaders), getOpaque(respHeaders), nc2, cnonce,
qop));
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicDigestAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicDigestAuthenticator.java?rev=1713194&r1=1713193&r2=1713194&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicDigestAuthenticator.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicDigestAuthenticator.java
Sat Nov 7 22:38:55 2015
@@ -251,7 +251,6 @@ public class TestJaspicDigestAuthenticat
// Third request should succeed if we increment nc
auth.clear();
bc.recycle();
- bc.reset();
auth.add(buildDigestResponse(user, pwd, digestUri, realm,
getNonce(respHeaders), getOpaque(respHeaders), nc2, cnonce,
qop));
Modified: tomcat/trunk/test/org/apache/tomcat/util/buf/TestUEncoder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/buf/TestUEncoder.java?rev=1713194&r1=1713193&r2=1713194&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/buf/TestUEncoder.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/buf/TestUEncoder.java Sat Nov 7
22:38:55 2015
@@ -20,8 +20,6 @@ package org.apache.tomcat.util.buf;
import java.io.IOException;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
import org.junit.Test;
import org.apache.tomcat.util.buf.UEncoder.SafeCharsSet;
@@ -32,25 +30,6 @@ import org.apache.tomcat.util.buf.UEncod
public class TestUEncoder {
@Test
- public void testEncodeURL() throws IOException {
- UEncoder urlEncoder = new UEncoder();
-
- String s = "a/b/c/d+e.class";
- assertTrue(urlEncoder.encodeURL(s, 0, s.length()).equals(
- "a%2fb%2fc%2fd%2be.class"));
- assertTrue(urlEncoder.encodeURL(s, 2, s.length() - 2).equals(
- "b%2fc%2fd%2be.cla"));
-
- urlEncoder.addSafeCharacter('+');
- assertTrue(urlEncoder.encodeURL(s, 0, s.length()).equals(
- "a%2fb%2fc%2fd+e.class"));
-
- s = new String(new char[] { 0xD801, 0xDC01 });
- assertTrue(urlEncoder.encodeURL(s, 0, s.length())
- .equals("%f0%90%90%81"));
- }
-
- @Test
public void testEncodeURLWithSlashInit() throws IOException {
UEncoder urlEncoder = new UEncoder(SafeCharsSet.WITH_SLASH);
@@ -60,16 +39,8 @@ public class TestUEncoder {
assertTrue(urlEncoder.encodeURL(s, 2, s.length() - 2).equals(
"b/c/d%2be.cla"));
- try {
- urlEncoder.addSafeCharacter('+');
- fail();
- } catch (IllegalStateException e) {
- // OK
- }
-
s = new String(new char[] { 0xD801, 0xDC01 });
assertTrue(urlEncoder.encodeURL(s, 0, s.length())
.equals("%f0%90%90%81"));
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
