You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by vi...@apache.org on 2017/01/10 16:54:28 UTC
svn commit: r1778161 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/
java/org/apache/coyote/http2/ java/org/apache/jasper/compiler/
java/org/apache/jasper/compiler/tagplugin/
java/org/apache/jasper/resources/ java/org/apache/jasper/runtime/ java...
Author: violetagg
Date: Tue Jan 10 16:54:28 2017
New Revision: 1778161
URL: http://svn.apache.org/viewvc?rev=1778161&view=rev
Log:
Spelling fixes. Patch provided by Josh Soref.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/coyote/InputBuffer.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/HPackHuffman.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Hpack.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/StreamStateMachine.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspConfig.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspUtil.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Node.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/PageInfo.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/ParserController.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/SmapUtil.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Validator.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/tagplugins/jstl/core/Otherwise.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/tagplugins/jstl/core/Param.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java
tomcat/tc8.5.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java
tomcat/tc8.5.x/trunk/java/org/apache/juli/OneLineFormatter.java
tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/FactoryBase.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/buildutil/SignCode.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/jni/Registry.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/jni/Status.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/package.html
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/ContextHandler.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/package.html
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/modules/package.html
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/package.html
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLImplementation.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 10 16:54:28 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
+/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
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/InputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/InputBuffer.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/InputBuffer.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/InputBuffer.java Tue Jan 10 16:54:28 2017
@@ -47,11 +47,11 @@ public interface InputBuffer {
/**
* Read from the input stream into the ByteBuffer provided by the
- * ApplicaitonBufferHandler.
+ * ApplicationBufferHandler.
* IMPORTANT: the current model assumes that the protocol will 'own' the
* ByteBuffer and return a pointer to it.
*
- * @param handler ApplicaitonBufferHandler that provides the buffer to read
+ * @param handler ApplicationBufferHandler that provides the buffer to read
* data into.
*
* @return The number of bytes that have been added to the buffer or -1 for
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/HPackHuffman.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/HPackHuffman.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/HPackHuffman.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/HPackHuffman.java Tue Jan 10 16:54:28 2017
@@ -517,7 +517,7 @@ public class HPackHuffman {
protected static class HuffmanCode {
/**
- * The value of the least significan't bits of the code
+ * The value of the least significant bits of the code
*/
int value;
/**
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Hpack.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Hpack.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Hpack.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Hpack.java Tue Jan 10 16:54:28 2017
@@ -133,7 +133,7 @@ final class Hpack {
}
/**
- * Decodes an integer in the HPACK prefex format. If the return value is -1
+ * Decodes an integer in the HPACK prefix format. If the return value is -1
* it means that there was not enough data in the buffer to complete the decoding
* sequence.
* <p/>
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/LocalStrings.properties?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/LocalStrings.properties (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/LocalStrings.properties Tue Jan 10 16:54:28 2017
@@ -72,14 +72,14 @@ pingManager.roundTripTime=Connection [{0
stream.closed=Connection [{0}], Stream [{1}], Unable to write to stream once it has been closed
stream.header.debug=Connection [{0}], Stream [{1}], HTTP header [{2}], Value [{3}]
-stream.header.unexpectedPseudoHeader=Connection [{0}], Stream [{1}], Pseduo header [{2}] received after a regular header
-stream.header.unknownPseudoHeader=Connection [{0}], Stream [{1}], Unknown pseduo header [{2}] received
+stream.header.unexpectedPseudoHeader=Connection [{0}], Stream [{1}], Pseudo header [{2}] received after a regular header
+stream.header.unknownPseudoHeader=Connection [{0}], Stream [{1}], Unknown pseudo header [{2}] received
stream.notWritable=Connection [{0}], Stream [{1}], This stream is not writable
stream.reprioritisation.debug=Connection [{0}], Stream [{1}], Exclusive [{2}], Parent [{3}], Weight [{4}]
stream.reset.fail=Connection [{0}], Stream [{1}], Failed to reset stream
stream.reset.receive=Connection [{0}], Stream [{1}], Reset received due to [{2}]
stream.reset.send=Connection [{0}], Stream [{1}], Reset sent due to [{2}]
-stream.trialerHeader.noEndOfStream=Connection [{0}], Stream [{1}], The trailer headers did not include the end of stream flag
+stream.trailerHeader.noEndOfStream=Connection [{0}], Stream [{1}], The trailer headers did not include the end of stream flag
stream.write=Connection [{0}], Stream [{1}]
stream.inputBuffer.copy=Copying [{0}] bytes from inBuffer to outBuffer
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java Tue Jan 10 16:54:28 2017
@@ -90,7 +90,7 @@ public class Stream extends AbstractStre
// Headers have been populated by this point
state.receivedStartOfHeaders();
// TODO Assuming the body has been read at this point is not valid
- state.recievedEndOfStream();
+ state.receivedEndOfStream();
}
// No sendfile for HTTP/2 (it is enabled by default in the request)
this.coyoteRequest.setSendfile(false);
@@ -401,7 +401,7 @@ public class Stream extends AbstractStre
handler.getHpackDecoder().setMaxHeaderCount(handler.getMaxTrailerCount());
handler.getHpackDecoder().setMaxHeaderSize(handler.getMaxTrailerSize());
} else {
- throw new ConnectionException(sm.getString("stream.trialerHeader.noEndOfStream",
+ throw new ConnectionException(sm.getString("stream.trailerHeader.noEndOfStream",
getConnectionId(), getIdentifier()), Http2Error.PROTOCOL_ERROR);
}
}
@@ -415,7 +415,7 @@ public class Stream extends AbstractStre
synchronized (inputBuffer) {
inputBuffer.notifyAll();
}
- state.recievedEndOfStream();
+ state.receivedEndOfStream();
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/StreamStateMachine.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/StreamStateMachine.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/StreamStateMachine.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/StreamStateMachine.java Tue Jan 10 16:54:28 2017
@@ -76,7 +76,7 @@ public class StreamStateMachine {
}
- public synchronized void recievedEndOfStream() {
+ public synchronized void receivedEndOfStream() {
stateChange(State.OPEN, State.HALF_CLOSED_REMOTE);
stateChange(State.HALF_CLOSED_LOCAL, State.CLOSED_RX);
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Generator.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Generator.java Tue Jan 10 16:54:28 2017
@@ -1390,7 +1390,7 @@ class Generator {
}
}
- // JSP.5.1, Sematics, para 1 - lock not required for request or
+ // JSP.5.1, Semantics, para 1 - lock not required for request or
// page scope
String scopename = "javax.servlet.jsp.PageContext.PAGE_SCOPE"; // Default to page
String lock = null;
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspConfig.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspConfig.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspConfig.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspConfig.java Tue Jan 10 16:54:28 2017
@@ -339,7 +339,7 @@ public class JspConfig {
String isTrimDirectiveWhitespaces = defaultTrimDirectiveWhitespaces;
String defaultContentType = defaultDefaultContentType;
String buffer = defaultBuffer;
- String errorOnUndelcaredNamespace = defaultErrorOnUndeclaredNamespace;
+ String errorOnUndeclaredNamespace = defaultErrorOnUndeclaredNamespace;
if (isXmlMatch != null) {
isXml = isXmlMatch.getJspProperty().isXml();
@@ -370,14 +370,14 @@ public class JspConfig {
buffer = bufferMatch.getJspProperty().getBuffer();
}
if (errorOnUndeclaredNamespaceMatch != null) {
- errorOnUndelcaredNamespace =
+ errorOnUndeclaredNamespace =
errorOnUndeclaredNamespaceMatch.getJspProperty().isErrorOnUndeclaredNamespace();
}
return new JspProperty(isXml, isELIgnored, isScriptingInvalid,
pageEncoding, includePreludes, includeCodas,
isDeferedSyntaxAllowedAsLiteral, isTrimDirectiveWhitespaces,
- defaultContentType, buffer, errorOnUndelcaredNamespace);
+ defaultContentType, buffer, errorOnUndeclaredNamespace);
}
/**
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspUtil.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspUtil.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspUtil.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspUtil.java Tue Jan 10 16:54:28 2017
@@ -868,7 +868,7 @@ public class JspUtil {
/**
* Mangle the specified character to create a legal Java class name.
* @param ch The character
- * @return the replacement charater as a string
+ * @return the replacement character as a string
*/
public static final String mangleChar(char ch) {
char[] result = new char[5];
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Node.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Node.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Node.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Node.java Tue Jan 10 16:54:28 2017
@@ -229,7 +229,7 @@ abstract class Node implements TagConsta
/**
* Get the attribute that is non request time expression, either from the
- * attribute of the node, or from a jsp:attrbute
+ * attribute of the node, or from a jsp:attribute
*
* @param name The name of the attribute
*
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/PageInfo.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/PageInfo.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/PageInfo.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/PageInfo.java Tue Jan 10 16:54:28 2017
@@ -97,7 +97,7 @@ class PageInfo {
private final Vector<String> pluginDcls; // Id's for tagplugin declarations
// JSP 2.2
- private boolean errorOnUndeclaredNamepsace = false;
+ private boolean errorOnUndeclaredNamespace = false;
private final boolean isTagFile;
@@ -721,11 +721,11 @@ class PageInfo {
}
public boolean isErrorOnUndeclaredNamespace() {
- return errorOnUndeclaredNamepsace;
+ return errorOnUndeclaredNamespace;
}
public void setErrorOnUndeclaredNamespace(
boolean errorOnUndeclaredNamespace) {
- this.errorOnUndeclaredNamepsace = errorOnUndeclaredNamespace;
+ this.errorOnUndeclaredNamespace = errorOnUndeclaredNamespace;
}
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/ParserController.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/ParserController.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/ParserController.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/ParserController.java Tue Jan 10 16:54:28 2017
@@ -157,7 +157,7 @@ class ParserController implements TagCon
* @param inFileName The name of the tag file to be parsed.
* @param jar The location of the tag file.
*
- * @return The parsed tage file nodes
+ * @return The parsed tag file nodes
*
* @throws JasperException If an error occurs during parsing
* @throws IOException If an I/O error occurs such as the file not being
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/SmapUtil.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/SmapUtil.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/SmapUtil.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/SmapUtil.java Tue Jan 10 16:54:28 2017
@@ -255,7 +255,7 @@ public class SmapUtil {
// if "SourceDebugExtension" symbol not there add it
writeUtf8ForSDE();
- // increment the countantPoolCount
+ // increment the constantPoolCount
sdeIndex = constantPoolCount;
++constantPoolCount;
randomAccessWriteU2(constantPoolCountPos, constantPoolCount);
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Validator.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Validator.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Validator.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Validator.java Tue Jan 10 16:54:28 2017
@@ -997,7 +997,7 @@ class Validator {
}
if (doctypePublic != null && doctypeSystem == null) {
- err.jspError(n, "jsp.error.jspoutput.doctypepulicsystem");
+ err.jspError(n, "jsp.error.jspoutput.doctypepublicsystem");
}
if (omitXmlDecl != null) {
@@ -1718,7 +1718,7 @@ class Validator {
@Override
public void visit(ELNode.Function n) throws JasperException {
- // Lambda / ImportHandler defined fucntion
+ // Lambda / ImportHandler defined function
if (n.getFunctionInfo() == null) {
return;
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java Tue Jan 10 16:54:28 2017
@@ -107,7 +107,7 @@ public interface TagPluginContext {
* to getPluginAttribute and setPluginAttribute, and queries (e.g.
* isScriptless(). There should be no calls to generate*().
* @return The pluginContext for the parent node.
- * null if the parent is not a custom tag, or if the pluginConxt
+ * null if the parent is not a custom tag, or if the pluginContext
* if not available (because useTagPlugin is false, e.g).
*/
TagPluginContext getParentContext();
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties Tue Jan 10 16:54:28 2017
@@ -325,7 +325,7 @@ jsp.error.xml.closeQuoteMissingInXMLDecl
jsp.error.multiple.jsp = Cannot have multiple specifications of
jsp.error.jspoutput.conflict=<jsp:output>: illegal to have multiple occurrences of \"{0}\" with different values (old: {1}, new: {2})
jsp.error.jspoutput.doctypenamesystem=<jsp:output>: 'doctype-root-element' and 'doctype-system' attributes must appear together
-jsp.error.jspoutput.doctypepulicsystem=<jsp:output>: 'doctype-system' attribute must appear if 'doctype-public' attribute appears
+jsp.error.jspoutput.doctypepublicsystem=<jsp:output>: 'doctype-system' attribute must appear if 'doctype-public' attribute appears
jsp.error.jspoutput.nonemptybody=<jsp:output> must not have a body
jsp.error.jspoutput.invalidUse=<jsp:output> must not be used in standard syntax
jsp.error.attributes.not.allowed = {0} must not have any attributes
@@ -409,7 +409,7 @@ jsp.error.el_interpreter_class.instantia
org.apache.jasper.compiler.ELParser.invalidQuotesForStringLiteral=The String literal [{0}] is not valid. It must be contained within single or double quotes.
org.apache.jasper.compiler.ELParser.invalidQuoting=The expression [{0}] is not valid. Within a quoted String only [\\], [''] and ["] may be escaped with [\\].
-org.apache.jasper.compiler.TldCache.servletContextNull=The provided SevletContext was null
+org.apache.jasper.compiler.TldCache.servletContextNull=The provided ServletContext was null
org.apache.jasper.servlet.JasperInitializer.onStartup=Initializing Jasper for context [{0}]
org.apache.jasper.servlet.TldScanner.webxmlSkip=Skipping load of TLD for URI {1} from resource path {0} as it has already been defined in <jsp-config>
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java Tue Jan 10 16:54:28 2017
@@ -61,7 +61,7 @@ public class JspApplicationContextImpl i
@Override
public void addELContextListener(ELContextListener listener) {
if (listener == null) {
- throw new IllegalArgumentException("ELConextListener was null");
+ throw new IllegalArgumentException("ELContextListener was null");
}
this.contextListeners.add(listener);
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/tagplugins/jstl/core/Otherwise.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/tagplugins/jstl/core/Otherwise.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/tagplugins/jstl/core/Otherwise.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/tagplugins/jstl/core/Otherwise.java Tue Jan 10 16:54:28 2017
@@ -26,7 +26,7 @@ public final class Otherwise implements
@Override
public void doTag(TagPluginContext ctxt) {
- // See When.java for the reason whey "}" is need at the beginng and
+ // See When.java for the reason whey "}" is need at the beginning and
// not at the end.
ctxt.generateJavaSource("} else {");
ctxt.generateBody();
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/tagplugins/jstl/core/Param.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/tagplugins/jstl/core/Param.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/tagplugins/jstl/core/Param.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/tagplugins/jstl/core/Param.java Tue Jan 10 16:54:28 2017
@@ -38,7 +38,7 @@ public class Param implements TagPlugin
//if the param tag has no parents, throw a exception
TagPluginContext parent = ctxt.getParentContext();
if(parent == null){
- ctxt.generateJavaSource(" throw new JspTagExcption" +
+ ctxt.generateJavaSource(" throw new JspTagException" +
"(\"<param> outside <import> or <urlEncode>\");");
return;
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java Tue Jan 10 16:54:28 2017
@@ -75,7 +75,7 @@ public class FastRemovalDequeue<T> {
/**
* Retrieve the size of the list.
- * This method also needs to be externaly synchronized to
+ * This method also needs to be externally synchronized to
* ensure correct publication of changes.
*
* @return the size of the list.
@@ -205,7 +205,7 @@ public class FastRemovalDequeue<T> {
* Moves the element in front.
*
* Could also be implemented as remove() and
- * push(), but explicitely coding might be a bit faster.
+ * push(), but explicitly coding might be a bit faster.
*
* @param element the entry to move in front.
* */
Modified: tomcat/tc8.5.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java Tue Jan 10 16:54:28 2017
@@ -550,7 +550,7 @@ public class ClassLoaderLogManager exten
continue;
}
// Parse and remove a prefix (prefix start with a digit, such as
- // "10WebappFooHanlder.")
+ // "10WebappFooHandler.")
if (Character.isDigit(handlerClassName.charAt(0))) {
int pos = handlerClassName.indexOf('.');
if (pos >= 0) {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/juli/OneLineFormatter.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/juli/OneLineFormatter.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/juli/OneLineFormatter.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/juli/OneLineFormatter.java Tue Jan 10 16:54:28 2017
@@ -39,7 +39,7 @@ import java.util.logging.LogRecord;
public class OneLineFormatter extends Formatter {
private static final String ST_SEP = System.lineSeparator() + " ";
- private static final String UNKONWN_THREAD_NAME = "Unknown thread with ID ";
+ private static final String UNKNOWN_THREAD_NAME = "Unknown thread with ID ";
private static final Object threadMxBeanLock = new Object();
private static volatile ThreadMXBean threadMxBean = null;
private static final int THREAD_NAME_CACHE_SIZE = 10000;
@@ -205,7 +205,7 @@ public class OneLineFormatter extends Fo
}
if (logRecordThreadId > Integer.MAX_VALUE / 2) {
- result = UNKONWN_THREAD_NAME + logRecordThreadId;
+ result = UNKNOWN_THREAD_NAME + logRecordThreadId;
} else {
// Double checked locking OK as threadMxBean is volatile
if (threadMxBean == null) {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/FactoryBase.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/FactoryBase.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/FactoryBase.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/FactoryBase.java Tue Jan 10 16:54:28 2017
@@ -121,7 +121,7 @@ public abstract class FactoryBase implem
* @return The default factory for the given reference object or
* <code>null</code> if no default factory exists.
*
- * @throws NamingException If the default factory cannot be craeted
+ * @throws NamingException If the default factory cannot be created
*/
protected abstract ObjectFactory getDefaultFactory(Reference ref)
throws NamingException;
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/buildutil/SignCode.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/buildutil/SignCode.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/buildutil/SignCode.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/buildutil/SignCode.java Tue Jan 10 16:54:28 2017
@@ -182,7 +182,7 @@ public class SignCode extends Task {
SOAPConnectionFactory soapConnectionFactory = SOAPConnectionFactory.newInstance();
SOAPConnection connection = soapConnectionFactory.createConnection();
- log("Sending siging request to server and waiting for response");
+ log("Sending singing request to server and waiting for response");
SOAPMessage response = connection.call(message, SIGNING_SERVICE_URL);
log("Processing response");
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/jni/Registry.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/jni/Registry.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/jni/Registry.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/jni/Registry.java Tue Jan 10 16:54:28 2017
@@ -17,7 +17,7 @@
package org.apache.tomcat.jni;
-/** Windows Registy support
+/** Windows Registry support
*
* @author Mladen Turk
*/
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/jni/Status.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/jni/Status.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/jni/Status.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/jni/Status.java Tue Jan 10 16:54:28 2017
@@ -144,7 +144,7 @@ public class Status {
* APR_ANONYMOUS APR is using anonymous shared memory
* APR_FILEBASED APR is using a file name as the key to the shared memory
* APR_KEYBASED APR is using a shared key as the key to the shared memory
- * APR_EINIT Ininitalizer value. If no option has been found, but
+ * APR_EINIT Initializer value. If no option has been found, but
* the status variable requires a value, this should be used
* APR_ENOTIMPL The APR function has not been implemented on this
* platform, either because nobody has gotten to it yet,
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java Tue Jan 10 16:54:28 2017
@@ -84,7 +84,7 @@ public final class ByteChunk implements
public int realReadBytes() throws IOException;
}
- /** Same as java.nio.channel.WrittableByteChannel.
+ /** Same as java.nio.channel.WritableByteChannel.
*/
public static interface ByteOutputChannel {
/**
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/package.html
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/package.html?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/package.html (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/package.html Tue Jan 10 16:54:28 2017
@@ -26,7 +26,7 @@ B2C converters are caching a ISReader/OS
in any VM without any garbage.
<p>
-This package must accomodate future extensions and additional converters ( most imporant: the nio.charset,
+This package must accomodate future extensions and additional converters ( most important: the nio.charset,
which should be detected and used if available ). Also, we do have one hand-written UTF8Decoder, and
other tuned encoders could be added.
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/ContextHandler.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/ContextHandler.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/ContextHandler.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/ContextHandler.java Tue Jan 10 16:54:28 2017
@@ -50,7 +50,7 @@ public class ContextHandler extends Reso
/**
* A list of QName specifying the SOAP Headers the handler will work on.
- * -namespace and locapart values must be found inside the WSDL.
+ * -namespace and localpart values must be found inside the WSDL.
*
* A service-qname is composed by a namespaceURI and a localpart.
*
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java Tue Jan 10 16:54:28 2017
@@ -361,7 +361,7 @@ public class SecurityConstraint extends
/**
- * Check if the contraint applies to a URI and method.
+ * Check if the constraint applies to a URI and method.
* @param uri Context-relative URI to check
* @param method Request method being used
* @return <code>true</code> if the specified context-relative URI (and
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java Tue Jan 10 16:54:28 2017
@@ -913,16 +913,16 @@ public class WebXml extends XmlEncodingB
}
for (ErrorPage errorPage : errorPages.values()) {
- String exeptionType = errorPage.getExceptionType();
+ String exceptionType = errorPage.getExceptionType();
int errorCode = errorPage.getErrorCode();
- if (exeptionType == null && errorCode == 0 && getMajorVersion() == 2) {
+ if (exceptionType == null && errorCode == 0 && getMajorVersion() == 2) {
// Default error pages are only supported from 3.0 onwards
continue;
}
sb.append(" <error-page>\n");
if (errorPage.getExceptionType() != null) {
- appendElement(sb, INDENT4, "exception-type", exeptionType);
+ appendElement(sb, INDENT4, "exception-type", exceptionType);
} else if (errorPage.getErrorCode() > 0) {
appendElement(sb, INDENT4, "error-code",
Integer.toString(errorCode));
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/package.html
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/package.html?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/package.html (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/package.html Tue Jan 10 16:54:28 2017
@@ -224,7 +224,7 @@ and pushes it on the stack when the begi
encountered. The object will remain there while the nested content of this
element is processed, and it will be popped off when the end of the element
is encountered. As we will see, the standard "object create" processing rule
-supports exactly this functionalility in a very convenient way.</p>
+supports exactly this functionality in a very convenient way.</p>
<p>Several potential issues with this design pattern are addressed by other
features of the Digester functionality:</p>
@@ -724,7 +724,7 @@ is done by following these steps:</p>
<ol>
<li>Tell <code>Digester</code> that you will be doing namespace
- aware parsing, by adding this statement in your initalization
+ aware parsing, by adding this statement in your initialization
of the Digester's properties:
<pre>
digester.setNamespaceAware(true);
@@ -815,7 +815,7 @@ Your implementation of the <code>match()
processing for a particular element is started or ended, and you must return
a <code>List</code> of the rules that are relevant for the current nesting
pattern. The order of the rules you return <strong>is</strong> significant,
-and should match the order in which rules were initally added.</p>
+and should match the order in which rules were initially added.</p>
<p>Your policy for rule selection should generally be sensitive to whether
<a href="#doc.Namespace">Namespace Aware Parsing</a> is taking place. In
@@ -962,7 +962,7 @@ public class MyRuleSet extends RuleSetBa
<h3>Using Named Stacks For Inter-Rule Communication</h3>
<p>
<code>Digester</code> is based on <code>Rule</code> instances working together
-to process xml. For anything other than the most trival processing,
+to process xml. For anything other than the most trivial processing,
communication between <code>Rule</code> instances is necessary. Since <code>Rule</code>
instances are processed in sequence, this usually means storing an Object
somewhere where later instances can retrieve it.
@@ -1018,7 +1018,7 @@ The <code><em>public-identifier</em></co
</p>
<p>
In practice, the weakness with a <code><em>system-identifier</em></code> is that most parsers
-will attempt to interprete this URI as an URL, try to download the resource directly
+will attempt to interpret this URI as an URL, try to download the resource directly
from the URL and stop the parsing if this download fails. So, this means that
almost always the URI will have to be an URL from which the declaration
can be downloaded.
@@ -1041,7 +1041,7 @@ The <code><em>public-identifier</em></co
strongly recommended that a unique, readable and open format is used (for reasons
that should become clear later). A Formal Public Identifier (FPI) is a very
common choice. This public identifier is often used to provide a unique and location
-independent key which can be used to subsistute local resources for remote ones
+independent key which can be used to substitute local resources for remote ones
(hint: this is why ;).
</p>
<p>
@@ -1086,7 +1086,7 @@ Digestion throws two kinds of <code>Exce
<li><code>org.xml.sax.SAXException</code></li>
</ul>
<p>
-The first is rarely thrown and indicates the kind of fundemental IO exception
+The first is rarely thrown and indicates the kind of fundamental IO exception
that developers know all about. The second is thrown by SAX parsers when the processing
of the XML cannot be completed. So, to diagnose the cause a certain familiarity with
the way that SAX error handling works is very useful.
@@ -1191,7 +1191,7 @@ However, an <code>IllegalAccessException
<p><code>MethodUtils</code> contains a workaround for this situation.
It will attempt to call <code>setAccessible</code> on this method.
If this call succeeds, then the method can be invoked as normal.
-This call will only succeed when the application has sufficient security privilages.
+This call will only succeed when the application has sufficient security privileges.
If this call fails then a warning will be logged and the method may fail.</p>
<p><code>Digester</code> uses <code>MethodUtils</code> and so there may be an issue accessing methods
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java Tue Jan 10 16:54:28 2017
@@ -62,7 +62,7 @@ import org.apache.juli.logging.LogFactor
* like Object and Class.
* - setModelMBean is no longer called on resources ( not used in tomcat )
* - no caching of Methods for now - operations and setters are not called repeatedly in most
- * management use cases. Getters should't be called very frequently either - and even if they
+ * management use cases. Getters shouldn't be called very frequently either - and even if they
* are, the overhead of getting the method should be small compared with other JMX costs ( RMI, etc ).
* We can add getter cache if needed.
* - removed unused constructor, fields
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java Tue Jan 10 16:54:28 2017
@@ -49,7 +49,7 @@ import org.apache.tomcat.util.modeler.mo
- double check the interfaces
- start removing the use of the experimental methods in tomcat, then remove
the methods ( before 1.1 final )
- - is the security enough to prevent Registry beeing used to avoid the permission
+ - is the security enough to prevent Registry being used to avoid the permission
checks in the mbean server ?
*/
@@ -85,7 +85,7 @@ public class Registry implements Registr
*/
private static Registry registry = null;
- // Per registy fields
+ // Per registry fields
/**
* The <code>MBeanServer</code> instance that we will use to register
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd Tue Jan 10 16:54:28 2017
@@ -129,7 +129,7 @@
<!-- The "descriptor" element groups a set of descriptor fields whose
values will be included in the Descriptor for the corresponding
- metatdata info classes.
+ metadata info classes.
-->
<!ELEMENT descriptor (field*)>
<!ATTLIST descriptor id ID #IMPLIED>
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/modules/package.html
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/modules/package.html?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/modules/package.html (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/modules/package.html Tue Jan 10 16:54:28 2017
@@ -21,7 +21,7 @@
<body>
<p>Implementation classes - should not be used directly. The API is not stable
but eventually the code will be refactored as a collection of mbeans that will be useable
-( more or less ) indepedently.</p>
+( more or less ) independently.</p>
<p>The MbeanDescriptors* classes are used to extract metadata from different sources. They
are result of few stages of refactoring - now they look very similar with ant tasks and are
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/package.html
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/package.html?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/package.html (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/package.html Tue Jan 10 16:54:28 2017
@@ -216,7 +216,7 @@ the standard support for loading a confi
and sufficient.</p>
<p>Modeler will also look for a mbeans-descriptors.xml in the same package
-with the class beeing registered and in its parent. If no metadata is found,
+with the class being registered and in its parent. If no metadata is found,
modeler will use a number of simple patterns, similar with the ones used by
ant, to determine a reasonable metadata</p>
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties Tue Jan 10 16:54:28 2017
@@ -80,7 +80,7 @@ endpoint.nio2.exclusiveExecutor=The NIO2
channel.nio.interrupted=The current thread was interrupted
channel.nio.ssl.notHandshaking=NOT_HANDSHAKING during handshake
-channel.nio.ssl.handhakeError=Handshake error
+channel.nio.ssl.handshakeError=Handshake error
channel.nio.ssl.unexpectedStatusDuringWrap=Unexpected status [{0}] during handshake WRAP.
channel.nio.ssl.unexpectedStatusDuringUnwrap=Unexpected status [{0}] during handshake UNWRAP.
channel.nio.ssl.invalidStatus=Unexpected status [{0}].
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Tue Jan 10 16:54:28 2017
@@ -589,7 +589,7 @@ public class NioEndpoint extends Abstrac
@Override
public String toString() {
return "Poller event: socket [" + socket + "], socketWrapper [" + socketWrapper +
- "], interstOps [" + interestOps + "]";
+ "], interestOps [" + interestOps + "]";
}
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java Tue Jan 10 16:54:28 2017
@@ -242,7 +242,7 @@ public class SecureNio2Channel extends N
try {
sc.write(netOutBuffer).get(endpoint.getSoTimeout(), TimeUnit.MILLISECONDS);
} catch (InterruptedException | ExecutionException | TimeoutException e) {
- throw new IOException(sm.getString("channel.nio.ssl.handhakeError"));
+ throw new IOException(sm.getString("channel.nio.ssl.handshakeError"));
}
}
return 1;
@@ -275,7 +275,7 @@ public class SecureNio2Channel extends N
try {
sc.write(netOutBuffer).get(endpoint.getSoTimeout(), TimeUnit.MILLISECONDS);
} catch (InterruptedException | ExecutionException | TimeoutException e) {
- throw new IOException(sm.getString("channel.nio.ssl.handhakeError"));
+ throw new IOException(sm.getString("channel.nio.ssl.handshakeError"));
}
}
return 1;
@@ -298,7 +298,7 @@ public class SecureNio2Channel extends N
try {
sc.read(netInBuffer).get(endpoint.getSoTimeout(), TimeUnit.MILLISECONDS);
} catch (InterruptedException | ExecutionException | TimeoutException e) {
- throw new IOException(sm.getString("channel.nio.ssl.handhakeError"));
+ throw new IOException(sm.getString("channel.nio.ssl.handshakeError"));
}
}
return 1;
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties Tue Jan 10 16:54:28 2017
@@ -21,7 +21,7 @@ openssl.keyManagerMissing=No key manager
openssl.trustManagerMissing=No trust manager found
engine.engineClosed=Engine is closed
-engine.renegociationUnsupported=Renegociation is not supported
+engine.renegotiationUnsupported=Renegotiation is not supported
engine.oversizedPacket=Encrypted packet is oversized
engine.ciphersFailure=Failed getting cipher list
engine.noSSLContext=No SSL context
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java Tue Jan 10 16:54:28 2017
@@ -358,17 +358,17 @@ public class OpenSSLContext implements o
Type type = certificate.getType();
String result = null;
- List<Type> candidiateTypes = new ArrayList<>();
+ List<Type> candidateTypes = new ArrayList<>();
if (Type.UNDEFINED.equals(type)) {
// Try all types to find an suitable alias
- candidiateTypes.addAll(Arrays.asList(Type.values()));
- candidiateTypes.remove(Type.UNDEFINED);
+ candidateTypes.addAll(Arrays.asList(Type.values()));
+ candidateTypes.remove(Type.UNDEFINED);
} else {
// Look for the specific type to find a suitable alias
- candidiateTypes.add(type);
+ candidateTypes.add(type);
}
- Iterator<Type> iter = candidiateTypes.iterator();
+ Iterator<Type> iter = candidateTypes.iterator();
while (result == null && iter.hasNext()) {
result = keyManager.chooseServerAlias(iter.next().toString(), null, null);
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLImplementation.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLImplementation.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLImplementation.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLImplementation.java Tue Jan 10 16:54:28 2017
@@ -38,7 +38,7 @@ public class OpenSSLImplementation exten
@Override
public boolean isAlpnSupported() {
- // OpenSSL supportd ALPN
+ // OpenSSL supported ALPN
return true;
}
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties Tue Jan 10 16:54:28 2017
@@ -85,7 +85,7 @@ wsRemoteEndpoint.invalidEncoder=The spec
wsRemoteEndpoint.noEncoder=No encoder specified for object of class [{0}]
wsRemoteEndpoint.nullData=Invalid null data argument
wsRemoteEndpoint.nullHandler=Invalid null handler argument
-wsRemoteEndpoint.sendInterupt=The current thread was interrupted while waiting for a blocking send to complete
+wsRemoteEndpoint.sendInterrupt=The current thread was interrupted while waiting for a blocking send to complete
wsRemoteEndpoint.tooMuchData=Ping or pong may not send more than 125 bytes
wsRemoteEndpoint.wrongState=The remote endpoint was in state [{0}] which is an invalid state for called method
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java Tue Jan 10 16:54:28 2017
@@ -299,7 +299,7 @@ public abstract class WsRemoteEndpointIm
throw new SocketTimeoutException(msg);
}
} catch (InterruptedException e) {
- String msg = sm.getString("wsRemoteEndpoint.sendInterupt");
+ String msg = sm.getString("wsRemoteEndpoint.sendInterrupt");
wsSession.doClose(new CloseReason(CloseCodes.GOING_AWAY, msg),
new CloseReason(CloseCodes.CLOSED_ABNORMALLY, msg));
throw new IOException(msg, e);
@@ -711,7 +711,7 @@ public abstract class WsRemoteEndpointIm
}
- protected abstract void doWrite(SendHandler handler, long blockingWrieTimeoutExpiry,
+ protected abstract void doWrite(SendHandler handler, long blockingWriteTimeoutExpiry,
ByteBuffer... data);
protected abstract boolean isMasked();
protected abstract void doClose();
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties?rev=1778161&r1=1778160&r2=1778161&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties Tue Jan 10 16:54:28 2017
@@ -33,8 +33,8 @@ pojoMethodMapping.onErrorNoThrowable=No
pojoMethodMapping.paramWithoutAnnotation=A parameter of type [{0}] was found on method[{1}] of class [{2}] that did not have a @PathParam annotation
pojoMethodMapping.partialInputStream=Invalid InputStream and boolean parameters present on the method [{0}] of class [{1}] that was annotated with OnMessage
pojoMethodMapping.partialObject=Invalid Object and boolean parameters present on the method [{0}] of class [{1}] that was annotated with OnMessage
-pojoMethodMapping.partialPong=Invalid PongMesssge and boolean parameters present on the method [{0}] of class [{1}] that was annotated with OnMessage
+pojoMethodMapping.partialPong=Invalid PongMessage and boolean parameters present on the method [{0}] of class [{1}] that was annotated with OnMessage
pojoMethodMapping.partialReader=Invalid Reader and boolean parameters present on the method [{0}] of class [{1}] that was annotated with OnMessage
-pojoMethodMapping.pongWithPayload=Invalid PongMessgae and Message parameters present on the method [{0}] of class [{1}] that was annotated with OnMessage
+pojoMethodMapping.pongWithPayload=Invalid PongMessage and Message parameters present on the method [{0}] of class [{1}] that was annotated with OnMessage
pojoMessageHandlerWhole.decodeIoFail=IO error while decoding message
pojoMessageHandlerWhole.maxBufferSize=The maximum supported message size for this implementation is Integer.MAX_VALUE
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org