Author: violetagg Date: Wed Feb 8 08:11:48 2017 New Revision: 1782117 URL: http://svn.apache.org/viewvc?rev=1782117&view=rev Log: Format the code. No functional changes.
Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsSession.java Propchange: tomcat/tc8.5.x/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Feb 8 08:11:48 2017 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747 924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1 756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217 2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763786,1763798-1763799,1763813,1763815,1763819,1763831,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698,1766700,1766822,1767047,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1767903,1767945-1767946,1768123,1768283,1768520,1768569,1768651,1768762,1768922,1769191,176 9263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867,1775596,1775985-1775986,1776540,1776937,1776954,1777011,1777173,1777189,1777211,1777546,1777605,1777619,1777647,1777721-1777722,1777967,1778061,1778138-1778139,1778141-1778150,1778154,1778275-1778276,1778295,1778342, 1778348,1778404,1778424,1778426,1778582,1778600,1779641,1779654,1779708,1779718,1779897,1779899,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780606,1780609-1780610,1780652,1780991,1780995-1780996,1781174,1781569,1781975,1781986 +/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747 924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1 756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217 2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763786,1763798-1763799,1763813,1763815,1763819,1763831,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698,1766700,1766822,1767047,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1767903,1767945-1767946,1768123,1768283,1768520,1768569,1768651,1768762,1768922,1769191,176 9263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867,1775596,1775985-1775986,1776540,1776937,1776954,1777011,1777173,1777189,1777211,1777546,1777605,1777619,1777647,1777721-1777722,1777967,1778061,1778138-1778139,1778141-1778150,1778154,1778275-1778276,1778295,1778342, 1778348,1778404,1778424,1778426,1778582,1778600,1779641,1779654,1779708,1779718,1779897,1779899,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780606,1780609-1780610,1780652,1780991,1780995-1780996,1781174,1781569,1781975,1781986,1782116 Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java?rev=1782117&r1=1782116&r2=1782117&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java Wed Feb 8 08:11:48 2017 @@ -42,8 +42,7 @@ import org.apache.tomcat.util.res.String */ public abstract class WsFrameBase { - private static final StringManager sm = - StringManager.getManager(WsFrameBase.class); + private static final StringManager sm = StringManager.getManager(WsFrameBase.class); // Connection level attributes protected final WsSession wsSession; @@ -88,10 +87,8 @@ public abstract class WsFrameBase { public WsFrameBase(WsSession wsSession, Transformation transformation) { inputBuffer = ByteBuffer.allocate(Constants.DEFAULT_BUFFER_SIZE); inputBuffer.position(0).limit(0); - messageBufferBinary = - ByteBuffer.allocate(wsSession.getMaxBinaryMessageBufferSize()); - messageBufferText = - CharBuffer.allocate(wsSession.getMaxTextMessageBufferSize()); + messageBufferBinary = ByteBuffer.allocate(wsSession.getMaxBinaryMessageBufferSize()); + messageBufferText = CharBuffer.allocate(wsSession.getMaxTextMessageBufferSize()); this.wsSession = wsSession; Transformation finalTransformation; if (isMasked()) { @@ -151,8 +148,7 @@ public abstract class WsFrameBase { if (!transformation.validateRsv(rsv, opCode)) { throw new WsIOException(new CloseReason( CloseCodes.PROTOCOL_ERROR, - sm.getString("wsFrame.wrongRsv", Integer.valueOf(rsv), - Integer.valueOf(opCode)))); + sm.getString("wsFrame.wrongRsv", Integer.valueOf(rsv), Integer.valueOf(opCode)))); } if (Util.isControl(opCode)) { @@ -166,8 +162,7 @@ public abstract class WsFrameBase { opCode != Constants.OPCODE_CLOSE) { throw new WsIOException(new CloseReason( CloseCodes.PROTOCOL_ERROR, - sm.getString("wsFrame.invalidOpCode", - Integer.valueOf(opCode)))); + sm.getString("wsFrame.invalidOpCode", Integer.valueOf(opCode)))); } } else { if (continuationExpected) { @@ -199,8 +194,7 @@ public abstract class WsFrameBase { } else { throw new WsIOException(new CloseReason( CloseCodes.PROTOCOL_ERROR, - sm.getString("wsFrame.invalidOpCode", - Integer.valueOf(opCode)))); + sm.getString("wsFrame.invalidOpCode", Integer.valueOf(opCode)))); } } catch (IllegalStateException ise) { // Thrown if the session is already closed @@ -267,8 +261,7 @@ public abstract class WsFrameBase { if (payloadLength > 125) { throw new WsIOException(new CloseReason( CloseCodes.PROTOCOL_ERROR, - sm.getString("wsFrame.controlPayloadTooBig", - Long.valueOf(payloadLength)))); + sm.getString("wsFrame.controlPayloadTooBig", Long.valueOf(payloadLength)))); } if (!fin) { throw new WsIOException(new CloseReason( @@ -329,8 +322,8 @@ public abstract class WsFrameBase { if (controlBufferBinary.remaining() > 1) { code = controlBufferBinary.getShort(); if (controlBufferBinary.remaining() > 0) { - CoderResult cr = utf8DecoderControl.decode( - controlBufferBinary, controlBufferText, true); + CoderResult cr = utf8DecoderControl.decode(controlBufferBinary, + controlBufferText, true); if (cr.isError()) { controlBufferBinary.clear(); controlBufferText.clear(); @@ -351,8 +344,7 @@ public abstract class WsFrameBase { wsSession.getBasicRemote().sendPong(controlBufferBinary); } } else if (opCode == Constants.OPCODE_PONG) { - MessageHandler.Whole<PongMessage> mhPong = - wsSession.getPongMessageHandler(); + MessageHandler.Whole<PongMessage> mhPong = wsSession.getPongMessageHandler(); if (mhPong != null) { try { mhPong.onMessage(new WsPongMessage(controlBufferBinary)); @@ -367,8 +359,7 @@ public abstract class WsFrameBase { controlBufferBinary.clear(); throw new WsIOException(new CloseReason( CloseCodes.PROTOCOL_ERROR, - sm.getString("wsFrame.invalidOpCode", - Integer.valueOf(opCode)))); + sm.getString("wsFrame.invalidOpCode", Integer.valueOf(opCode)))); } controlBufferBinary.clear(); newFrame(); @@ -379,10 +370,8 @@ public abstract class WsFrameBase { @SuppressWarnings("unchecked") protected void sendMessageText(boolean last) throws WsIOException { if (textMsgHandler instanceof WrappedMessageHandler) { - long maxMessageSize = - ((WrappedMessageHandler) textMsgHandler).getMaxMessageSize(); - if (maxMessageSize > -1 && - messageBufferText.remaining() > maxMessageSize) { + long maxMessageSize = ((WrappedMessageHandler) textMsgHandler).getMaxMessageSize(); + if (maxMessageSize > -1 && messageBufferText.remaining() > maxMessageSize) { throw new WsIOException(new CloseReason(CloseCodes.TOO_BIG, sm.getString("wsFrame.messageTooBig", Long.valueOf(messageBufferText.remaining()), @@ -392,12 +381,12 @@ public abstract class WsFrameBase { try { if (textMsgHandler instanceof MessageHandler.Partial<?>) { - ((MessageHandler.Partial<String>) textMsgHandler).onMessage( - messageBufferText.toString(), last); + ((MessageHandler.Partial<String>) textMsgHandler) + .onMessage(messageBufferText.toString(), last); } else { // Caller ensures last == true if this branch is used - ((MessageHandler.Whole<String>) textMsgHandler).onMessage( - messageBufferText.toString()); + ((MessageHandler.Whole<String>) textMsgHandler) + .onMessage(messageBufferText.toString()); } } catch (Throwable t) { handleThrowableOnSend(t); @@ -415,8 +404,8 @@ public abstract class WsFrameBase { // Convert bytes to UTF-8 messageBufferBinary.flip(); while (true) { - CoderResult cr = utf8DecoderMessage.decode( - messageBufferBinary, messageBufferText, false); + CoderResult cr = utf8DecoderMessage.decode(messageBufferBinary, messageBufferText, + false); if (cr.isError()) { throw new WsIOException(new CloseReason( CloseCodes.NOT_CONSISTENT, @@ -458,8 +447,8 @@ public abstract class WsFrameBase { // Frame is fully received // Convert bytes to UTF-8 while (true) { - CoderResult cr = utf8DecoderMessage.decode(messageBufferBinary, - messageBufferText, last); + CoderResult cr = utf8DecoderMessage.decode(messageBufferBinary, messageBufferText, + last); if (cr.isError()) { throw new WsIOException(new CloseReason( CloseCodes.NOT_CONSISTENT, @@ -520,14 +509,12 @@ public abstract class WsFrameBase { if (!usePartial()) { CloseReason cr = new CloseReason(CloseCodes.TOO_BIG, sm.getString("wsFrame.bufferTooSmall", - Integer.valueOf( - messageBufferBinary.capacity()), + Integer.valueOf(messageBufferBinary.capacity()), Long.valueOf(payloadLength))); throw new WsIOException(cr); } messageBufferBinary.flip(); - ByteBuffer copy = - ByteBuffer.allocate(messageBufferBinary.limit()); + ByteBuffer copy = ByteBuffer.allocate(messageBufferBinary.limit()); copy.put(messageBufferBinary); copy.flip(); sendMessageBinary(copy, false); @@ -542,8 +529,7 @@ public abstract class WsFrameBase { // - the message is complete if (usePartial() || !continuationExpected) { messageBufferBinary.flip(); - ByteBuffer copy = - ByteBuffer.allocate(messageBufferBinary.limit()); + ByteBuffer copy = ByteBuffer.allocate(messageBufferBinary.limit()); copy.put(messageBufferBinary); copy.flip(); sendMessageBinary(copy, !continuationExpected); @@ -572,11 +558,9 @@ public abstract class WsFrameBase { @SuppressWarnings("unchecked") - protected void sendMessageBinary(ByteBuffer msg, boolean last) - throws WsIOException { + protected void sendMessageBinary(ByteBuffer msg, boolean last) throws WsIOException { if (binaryMsgHandler instanceof WrappedMessageHandler) { - long maxMessageSize = - ((WrappedMessageHandler) binaryMsgHandler).getMaxMessageSize(); + long maxMessageSize = ((WrappedMessageHandler) binaryMsgHandler).getMaxMessageSize(); if (maxMessageSize > -1 && msg.remaining() > maxMessageSize) { throw new WsIOException(new CloseReason(CloseCodes.TOO_BIG, sm.getString("wsFrame.messageTooBig", @@ -591,7 +575,7 @@ public abstract class WsFrameBase { // Caller ensures last == true if this branch is used ((MessageHandler.Whole<ByteBuffer>) binaryMsgHandler).onMessage(msg); } - } catch(Throwable t) { + } catch (Throwable t) { handleThrowableOnSend(t); } } @@ -674,11 +658,9 @@ public abstract class WsFrameBase { } - protected static long byteArrayToLong(byte[] b, int start, int len) - throws IOException { + protected static long byteArrayToLong(byte[] b, int start, int len) throws IOException { if (len > 8) { - throw new IOException(sm.getString("wsFrame.byteToLongFail", - Long.valueOf(len))); + throw new IOException(sm.getString("wsFrame.byteToLongFail", Long.valueOf(len))); } int shift = 0; long result = 0; @@ -754,8 +736,7 @@ public abstract class WsFrameBase { // opCode is ignored as the transformation is the same for all // opCodes // rsv is ignored as it known to be zero at this point - long toWrite = Math.min( - payloadLength - payloadWritten, inputBuffer.remaining()); + long toWrite = Math.min(payloadLength - payloadWritten, inputBuffer.remaining()); toWrite = Math.min(toWrite, dest.remaining()); int orgLimit = inputBuffer.limit(); Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java?rev=1782117&r1=1782116&r2=1782117&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java Wed Feb 8 08:11:48 2017 @@ -31,16 +31,15 @@ import org.apache.tomcat.util.res.String public class WsFrameClient extends WsFrameBase { private final Log log = LogFactory.getLog(WsFrameClient.class); - private static final StringManager sm = - StringManager.getManager(WsFrameClient.class); + private static final StringManager sm = StringManager.getManager(WsFrameClient.class); private final AsyncChannelWrapper channel; - private final CompletionHandler<Integer,Void> handler; + private final CompletionHandler<Integer, Void> handler; // Not final as it may need to be re-sized private volatile ByteBuffer response; - public WsFrameClient(ByteBuffer response, AsyncChannelWrapper channel, - WsSession wsSession, Transformation transformation) { + public WsFrameClient(ByteBuffer response, AsyncChannelWrapper channel, WsSession wsSession, + Transformation transformation) { super(wsSession, transformation); this.response = response; this.channel = channel; @@ -92,8 +91,7 @@ public class WsFrameClient extends WsFra if (t instanceof WsIOException) { cr = ((WsIOException) t).getCloseReason(); } else { - cr = new CloseReason( - CloseCodes.CLOSED_ABNORMALLY, t.getMessage()); + cr = new CloseReason(CloseCodes.CLOSED_ABNORMALLY, t.getMessage()); } try { @@ -116,9 +114,7 @@ public class WsFrameClient extends WsFra return log; } - - private class WsFrameClientCompletionHandler - implements CompletionHandler<Integer,Void> { + private class WsFrameClientCompletionHandler implements CompletionHandler<Integer, Void> { @Override public void completed(Integer result, Void attachment) { @@ -152,8 +148,8 @@ public class WsFrameClient extends WsFra public void failed(Throwable exc, Void attachment) { if (exc instanceof ReadBufferOverflowException) { // response will be empty if this exception is thrown - response = ByteBuffer.allocate( - ((ReadBufferOverflowException) exc).getMinBufferSize()); + response = ByteBuffer + .allocate(((ReadBufferOverflowException) exc).getMinBufferSize()); response.flip(); try { processSocketRead(); Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsSession.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsSession.java?rev=1782117&r1=1782116&r2=1782117&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsSession.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsSession.java Wed Feb 8 08:11:48 2017 @@ -57,8 +57,7 @@ public class WsSession implements Sessio // An ellipsis is a single character that looks like three periods in a row // and is used to indicate a continuation. - private static final byte[] ELLIPSIS_BYTES = - "\u2026".getBytes(StandardCharsets.UTF_8); + private static final byte[] ELLIPSIS_BYTES = "\u2026".getBytes(StandardCharsets.UTF_8); // An ellipsis is three bytes in UTF-8 private static final int ELLIPSIS_BYTES_LEN = ELLIPSIS_BYTES.length; @@ -74,14 +73,14 @@ public class WsSession implements Sessio private final ClassLoader applicationClassLoader; private final WsWebSocketContainer webSocketContainer; private final URI requestUri; - private final Map<String,List<String>> requestParameterMap; + private final Map<String, List<String>> requestParameterMap; private final String queryString; private final Principal userPrincipal; private final EndpointConfig endpointConfig; private final List<Extension> negotiatedExtensions; private final String subProtocol; - private final Map<String,String> pathParameters; + private final Map<String, String> pathParameters; private final boolean secure; private final String httpSessionId; private final String id; @@ -93,14 +92,12 @@ public class WsSession implements Sessio private volatile MessageHandler.Whole<PongMessage> pongMessageHandler = null; private volatile State state = State.OPEN; private final Object stateLock = new Object(); - private final Map<String,Object> userProperties = new ConcurrentHashMap<>(); - private volatile int maxBinaryMessageBufferSize = - Constants.DEFAULT_BUFFER_SIZE; - private volatile int maxTextMessageBufferSize = - Constants.DEFAULT_BUFFER_SIZE; + private final Map<String, Object> userProperties = new ConcurrentHashMap<>(); + private volatile int maxBinaryMessageBufferSize = Constants.DEFAULT_BUFFER_SIZE; + private volatile int maxTextMessageBufferSize = Constants.DEFAULT_BUFFER_SIZE; private volatile long maxIdleTimeout = 0; private volatile long lastActive = System.currentTimeMillis(); - private Map<FutureToSendHandler,FutureToSendHandler> futures = new ConcurrentHashMap<>(); + private Map<FutureToSendHandler, FutureToSendHandler> futures = new ConcurrentHashMap<>(); /** * Creates a new WebSocket session for communication between the two @@ -140,9 +137,9 @@ public class WsSession implements Sessio public WsSession(Endpoint localEndpoint, WsRemoteEndpointImplBase wsRemoteEndpoint, WsWebSocketContainer wsWebSocketContainer, - URI requestUri, Map<String,List<String>> requestParameterMap, + URI requestUri, Map<String, List<String>> requestParameterMap, String queryString, Principal userPrincipal, String httpSessionId, - List<Extension> negotiatedExtensions, String subProtocol, Map<String,String> pathParameters, + List<Extension> negotiatedExtensions, String subProtocol, Map<String, String> pathParameters, boolean secure, EndpointConfig endpointConfig) throws DeploymentException { this.localEndpoint = localEndpoint; this.wsRemoteEndpoint = wsRemoteEndpoint; @@ -151,14 +148,10 @@ public class WsSession implements Sessio this.remoteEndpointBasic = new WsRemoteEndpointBasic(wsRemoteEndpoint); this.webSocketContainer = wsWebSocketContainer; applicationClassLoader = Thread.currentThread().getContextClassLoader(); - wsRemoteEndpoint.setSendTimeout( - wsWebSocketContainer.getDefaultAsyncSendTimeout()); - this.maxBinaryMessageBufferSize = - webSocketContainer.getDefaultMaxBinaryMessageBufferSize(); - this.maxTextMessageBufferSize = - webSocketContainer.getDefaultMaxTextMessageBufferSize(); - this.maxIdleTimeout = - webSocketContainer.getDefaultMaxSessionIdleTimeout(); + wsRemoteEndpoint.setSendTimeout(wsWebSocketContainer.getDefaultAsyncSendTimeout()); + this.maxBinaryMessageBufferSize = webSocketContainer.getDefaultMaxBinaryMessageBufferSize(); + this.maxTextMessageBufferSize = webSocketContainer.getDefaultMaxTextMessageBufferSize(); + this.maxIdleTimeout = webSocketContainer.getDefaultMaxSessionIdleTimeout(); this.requestUri = requestUri; if (requestParameterMap == null) { this.requestParameterMap = Collections.emptyMap(); @@ -242,48 +235,44 @@ public class WsSession implements Sessio // arbitrary objects with MessageHandlers and can wrap MessageHandlers // just as easily. - Set<MessageHandlerResult> mhResults = - Util.getMessageHandlers(target, listener, endpointConfig, this); + Set<MessageHandlerResult> mhResults = Util.getMessageHandlers(target, listener, + endpointConfig, this); for (MessageHandlerResult mhResult : mhResults) { switch (mhResult.getType()) { - case TEXT: { - if (textMessageHandler != null) { - throw new IllegalStateException( - sm.getString("wsSession.duplicateHandlerText")); - } - textMessageHandler = mhResult.getHandler(); - break; + case TEXT: { + if (textMessageHandler != null) { + throw new IllegalStateException(sm.getString("wsSession.duplicateHandlerText")); } - case BINARY: { - if (binaryMessageHandler != null) { - throw new IllegalStateException( - sm.getString("wsSession.duplicateHandlerBinary")); - } - binaryMessageHandler = mhResult.getHandler(); - break; + textMessageHandler = mhResult.getHandler(); + break; + } + case BINARY: { + if (binaryMessageHandler != null) { + throw new IllegalStateException( + sm.getString("wsSession.duplicateHandlerBinary")); } - case PONG: { - if (pongMessageHandler != null) { - throw new IllegalStateException( - sm.getString("wsSession.duplicateHandlerPong")); - } - MessageHandler handler = mhResult.getHandler(); - if (handler instanceof MessageHandler.Whole<?>) { - pongMessageHandler = - (MessageHandler.Whole<PongMessage>) handler; - } else { - throw new IllegalStateException( - sm.getString("wsSession.invalidHandlerTypePong")); - } - - break; + binaryMessageHandler = mhResult.getHandler(); + break; + } + case PONG: { + if (pongMessageHandler != null) { + throw new IllegalStateException(sm.getString("wsSession.duplicateHandlerPong")); } - default: { - throw new IllegalArgumentException(sm.getString( - "wsSession.unknownHandlerType", listener, - mhResult.getType())); + MessageHandler handler = mhResult.getHandler(); + if (handler instanceof MessageHandler.Whole<?>) { + pongMessageHandler = (MessageHandler.Whole<PongMessage>) handler; + } else { + throw new IllegalStateException( + sm.getString("wsSession.invalidHandlerTypePong")); } + + break; + } + default: { + throw new IllegalArgumentException( + sm.getString("wsSession.unknownHandlerType", listener, mhResult.getType())); + } } } } @@ -324,20 +313,17 @@ public class WsSession implements Sessio } boolean removed = false; - if (wrapped.equals(textMessageHandler) || - listener.equals(textMessageHandler)) { + if (wrapped.equals(textMessageHandler) || listener.equals(textMessageHandler)) { textMessageHandler = null; removed = true; } - if (wrapped.equals(binaryMessageHandler) || - listener.equals(binaryMessageHandler)) { + if (wrapped.equals(binaryMessageHandler) || listener.equals(binaryMessageHandler)) { binaryMessageHandler = null; removed = true; } - if (wrapped.equals(pongMessageHandler) || - listener.equals(pongMessageHandler)) { + if (wrapped.equals(pongMessageHandler) || listener.equals(pongMessageHandler)) { pongMessageHandler = null; removed = true; } @@ -629,29 +615,26 @@ public class WsSession implements Sessio * @param msg The message * @param reason The reason */ - protected static void appendCloseReasonWithTruncation(ByteBuffer msg, - String reason) { + protected static void appendCloseReasonWithTruncation(ByteBuffer msg, String reason) { // Once the close code has been added there are a maximum of 123 bytes // left for the reason phrase. If it is truncated then care needs to be // taken to ensure the bytes are not truncated in the middle of a // multi-byte UTF-8 character. byte[] reasonBytes = reason.getBytes(StandardCharsets.UTF_8); - if (reasonBytes.length <= 123) { + if (reasonBytes.length <= 123) { // No need to truncate msg.put(reasonBytes); } else { // Need to truncate int remaining = 123 - ELLIPSIS_BYTES_LEN; int pos = 0; - byte[] bytesNext = reason.substring(pos, pos + 1).getBytes( - StandardCharsets.UTF_8); + byte[] bytesNext = reason.substring(pos, pos + 1).getBytes(StandardCharsets.UTF_8); while (remaining >= bytesNext.length) { msg.put(bytesNext); remaining -= bytesNext.length; pos++; - bytesNext = reason.substring(pos, pos + 1).getBytes( - StandardCharsets.UTF_8); + bytesNext = reason.substring(pos, pos + 1).getBytes(StandardCharsets.UTF_8); } msg.put(ELLIPSIS_BYTES); } @@ -707,7 +690,7 @@ public class WsSession implements Sessio @Override - public Map<String,List<String>> getRequestParameterMap() { + public Map<String, List<String>> getRequestParameterMap() { checkState(); return requestParameterMap; } @@ -728,7 +711,7 @@ public class WsSession implements Sessio @Override - public Map<String,String> getPathParameters() { + public Map<String, String> getPathParameters() { checkState(); return pathParameters; } @@ -741,7 +724,7 @@ public class WsSession implements Sessio @Override - public Map<String,Object> getUserProperties() { + public Map<String, Object> getUserProperties() { checkState(); return userProperties; } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org