Author: markt
Date: Thu Feb 23 12:50:18 2012
New Revision: 1292779
URL: http://svn.apache.org/viewvc?rev=1292779&view=rev
Log:
Keep checkstyle happy
Modified:
tomcat/trunk/java/org/apache/tomcat/spdy/CompressDeflater6.java
tomcat/trunk/res/checkstyle/org-import-control.xml
Modified: tomcat/trunk/java/org/apache/tomcat/spdy/CompressDeflater6.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/spdy/CompressDeflater6.java?rev=1292779&r1=1292778&r2=1292779&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/spdy/CompressDeflater6.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/spdy/CompressDeflater6.java Thu Feb 23
12:50:18 2012
@@ -25,7 +25,6 @@ import org.apache.tomcat.spdy.SpdyConnec
/**
* Java6 Deflater with the workaround from tomcat http filters.
- *
*/
public class CompressDeflater6 implements CompressSupport {
public static long DICT_ID = 3751956914L;
@@ -90,7 +89,7 @@ public class CompressDeflater6 implement
public synchronized void compress(SpdyFrame frame, int start)
throws IOException {
init();
-
+
if (compressBuffer == null) {
compressBuffer = new byte[frame.data.length];
}
@@ -134,20 +133,20 @@ public class CompressDeflater6 implement
// nvCount is compressed in impl - spec is different
init();
-
+
if (decompressBuffer == null) {
decompressBuffer = new byte[frame.data.length];
}
-
+
// will read from dec buffer to frame.data
decMax = frame.endData;
decOff = start;
-
+
int off = start;
int max = frame.data.length;
-
+
zipIn.setInput(frame.data, start, decMax - start);
-
+
while (true) {
int rd;
try {
@@ -169,12 +168,12 @@ public class CompressDeflater6 implement
byte[] b = new byte[decompressBuffer.length * 2];
System.arraycopy(decompressBuffer, 0, b, 0, off);
decompressBuffer = b;
-
+
}
byte[] tmpBuf = decompressBuffer;
decompressBuffer = frame.data;
frame.data = tmpBuf;
-
+
frame.off = start;
frame.endData = off;
}
Modified: tomcat/trunk/res/checkstyle/org-import-control.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/org-import-control.xml?rev=1292779&r1=1292778&r2=1292779&view=diff
==============================================================================
--- tomcat/trunk/res/checkstyle/org-import-control.xml (original)
+++ tomcat/trunk/res/checkstyle/org-import-control.xml Thu Feb 23 12:50:18 2012
@@ -117,6 +117,9 @@
<allow pkg="org.apache.tools.ant"/>
</subpackage>
<subpackage name="jni"/>
+ <subpackage name="spdy">
+ <allow pkg="org.apache.tomcat.spdy"/>
+ </subpackage>
<subpackage name="util">
<allow pkg="org.apache.juli"/>
<allow pkg="org.apache.tomcat.jni"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
