tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kkoli...@apache.org
Subject svn commit: r1245812 - in /tomcat/trunk: java/org/apache/catalina/websocket/WsFrameHeader.java test/org/apache/catalina/util/TestConversions.java
Date Sat, 18 Feb 2012 00:02:11 GMT
Author: kkolinko
Date: Sat Feb 18 00:02:11 2012
New Revision: 1245812

URL: http://svn.apache.org/viewvc?rev=1245812&view=rev
Log:
svn:eol-style=native

Modified:
    tomcat/trunk/java/org/apache/catalina/websocket/WsFrameHeader.java   (contents, props
changed)
    tomcat/trunk/test/org/apache/catalina/util/TestConversions.java   (contents, props changed)

Modified: tomcat/trunk/java/org/apache/catalina/websocket/WsFrameHeader.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/WsFrameHeader.java?rev=1245812&r1=1245811&r2=1245812&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/websocket/WsFrameHeader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/websocket/WsFrameHeader.java Sat Feb 18 00:02:11
2012
@@ -1,62 +1,62 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.catalina.websocket;
-
-/**
- * This class does not represent the complete frame header, just those parts of
- * it that need to be exposed more widely than the {@link WsInputStream}.
- */
-public class WsFrameHeader {
-
-    private final boolean fin;
-    private final boolean rsv1;
-    private final boolean rsv2;
-    private final boolean rsv3;
-    private final byte opCode;
-
-    public WsFrameHeader(int b) {
-        fin = (b & 0x80) > 0;
-
-        rsv1 = (b & 0x40) > 0;
-        rsv2 = (b & 0x20) > 0;
-        rsv3 = (b & 0x10) > 0;
-
-        opCode = (byte) (b & 0x0F);
-    }
-
-    public boolean getFin() {
-        return fin;
-    }
-
-    public boolean getRsv1() {
-        return rsv1;
-    }
-
-    public boolean getRsv2() {
-        return rsv2;
-    }
-
-    public boolean getRsv3() {
-        return rsv3;
-    }
-
-    public byte getOpCode() {
-        return opCode;
-    }
-
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.websocket;
+
+/**
+ * This class does not represent the complete frame header, just those parts of
+ * it that need to be exposed more widely than the {@link WsInputStream}.
+ */
+public class WsFrameHeader {
+
+    private final boolean fin;
+    private final boolean rsv1;
+    private final boolean rsv2;
+    private final boolean rsv3;
+    private final byte opCode;
+
+    public WsFrameHeader(int b) {
+        fin = (b & 0x80) > 0;
+
+        rsv1 = (b & 0x40) > 0;
+        rsv2 = (b & 0x20) > 0;
+        rsv3 = (b & 0x10) > 0;
+
+        opCode = (byte) (b & 0x0F);
+    }
+
+    public boolean getFin() {
+        return fin;
+    }
+
+    public boolean getRsv1() {
+        return rsv1;
+    }
+
+    public boolean getRsv2() {
+        return rsv2;
+    }
+
+    public boolean getRsv3() {
+        return rsv3;
+    }
+
+    public byte getOpCode() {
+        return opCode;
+    }
+
+
+}

Propchange: tomcat/trunk/java/org/apache/catalina/websocket/WsFrameHeader.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: tomcat/trunk/test/org/apache/catalina/util/TestConversions.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/util/TestConversions.java?rev=1245812&r1=1245811&r2=1245812&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/util/TestConversions.java (original)
+++ tomcat/trunk/test/org/apache/catalina/util/TestConversions.java Sat Feb 18 00:02:11 2012
@@ -1,37 +1,37 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.catalina.util;
-
-import java.io.IOException;
-
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
-
-public class TestConversions {
-
-    @Test
-    public void testByteArrayToLong() throws IOException {
-        assertEquals(0L, Conversions.byteArrayToLong(new byte[] { 0 }));
-        assertEquals(1L, Conversions.byteArrayToLong(new byte[] { 1 }));
-        assertEquals(0xFF, Conversions.byteArrayToLong(new byte[] { -1 }));
-        assertEquals(0xFFFF,
-                Conversions.byteArrayToLong(new byte[] { -1, -1 }));
-        assertEquals(0xFFFFFF,
-                Conversions.byteArrayToLong(new byte[] { -1, -1, -1 }));
-    }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.util;
+
+import java.io.IOException;
+
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+
+public class TestConversions {
+
+    @Test
+    public void testByteArrayToLong() throws IOException {
+        assertEquals(0L, Conversions.byteArrayToLong(new byte[] { 0 }));
+        assertEquals(1L, Conversions.byteArrayToLong(new byte[] { 1 }));
+        assertEquals(0xFF, Conversions.byteArrayToLong(new byte[] { -1 }));
+        assertEquals(0xFFFF,
+                Conversions.byteArrayToLong(new byte[] { -1, -1 }));
+        assertEquals(0xFFFFFF,
+                Conversions.byteArrayToLong(new byte[] { -1, -1, -1 }));
+    }
+
+}

Propchange: tomcat/trunk/test/org/apache/catalina/util/TestConversions.java
------------------------------------------------------------------------------
    svn:eol-style = native



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message