[Bug 60674] Allow subclassing of org.apache.catalina.filters.CorsFilter

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=60674

--- Comment #5 from Ralf Hauser  ---
Tested in 8.5.14 --> works fine.

Thx for the clarifications that make my comment obsolete - sorry.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 61145] New: Missing @Documented annotation in some javax.annotation classes

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=61145

Bug ID: 61145
   Summary: Missing @Documented annotation in some
javax.annotation classes
   Product: Tomcat 9
   Version: unspecified
  Hardware: PC
OS: Mac OS X 10.1
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: katya.k.todor...@gmail.com
  Target Milestone: -

Created attachment 35026
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=35026&action=edit
Patch validated against tomcat tests and the corresponding specification

According to 
https://docs.oracle.com/javaee/7/api/javax/annotation/package-summary.html and 
https://docs.oracle.com/javaee/7/api/javax/annotation/security/package-summary.html

the following classes should have @Documented annotation:

javax.annotation.Generated
javax.annotation.PostConstruct
javax.annotation.PreDestroy
javax.annotation.Priority
javax.annotation.Resources
javax.annotation.security.DeclareRoles
javax.annotation.security.DenyAll
javax.annotation.security.PermitAll
javax.annotation.security.RolesAllowed
javax.annotation.security.RunAs

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 61146] New: javax.ejb.EJB doesn't contain lookup method

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=61146

Bug ID: 61146
   Summary: javax.ejb.EJB doesn't contain lookup method
   Product: Tomcat 9
   Version: unspecified
  Hardware: PC
OS: Mac OS X 10.1
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: katya.k.todor...@gmail.com
  Target Milestone: -

Created attachment 35027
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=35027&action=edit
Patch validated against tomcat tests and the corresponding specification

According to 
https://docs.oracle.com/javaee/7/api/javax/ejb/EJB.html

javax.ejb.EJB should have lookup method

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 61145] Missing @Documented annotation in some javax.annotation classes

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=61145

Violeta Georgieva  changed:

   What|Removed |Added

  Attachment #35026|0   |1
   is patch||
  Attachment #35026|application/mbox|text/plain
  mime type||

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 61145] Missing @Documented annotation in some javax.annotation classes

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=61145

--- Comment #1 from Mark Thomas  ---
Confirmed.

This also needs back-porting to 8.x and 7.x (less Priority which was introduced
in Java EE 7).

Working on this now...

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1797338 - in /tomcat/trunk: java/javax/annotation/ java/javax/annotation/security/ java/org/apache/jasper/compiler/ webapps/docs/

[markt]

Author: markt
Date: Fri Jun  2 09:19:28 2017
New Revision: 1797338

URL: http://svn.apache.org/viewvc?rev=1797338&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61145
Add missing @Documented annotation to annotations in the annotations API. Patch 
provided by Katya Todorova.

Modified:
tomcat/trunk/java/javax/annotation/Generated.java
tomcat/trunk/java/javax/annotation/PostConstruct.java
tomcat/trunk/java/javax/annotation/PreDestroy.java
tomcat/trunk/java/javax/annotation/Priority.java
tomcat/trunk/java/javax/annotation/Resources.java
tomcat/trunk/java/javax/annotation/security/DeclareRoles.java
tomcat/trunk/java/javax/annotation/security/DenyAll.java
tomcat/trunk/java/javax/annotation/security/PermitAll.java
tomcat/trunk/java/javax/annotation/security/RolesAllowed.java
tomcat/trunk/java/javax/annotation/security/RunAs.java
tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/javax/annotation/Generated.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/Generated.java?rev=1797338&r1=1797337&r2=1797338&view=diff
==
--- tomcat/trunk/java/javax/annotation/Generated.java (original)
+++ tomcat/trunk/java/javax/annotation/Generated.java Fri Jun  2 09:19:28 2017
@@ -20,10 +20,12 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
 
 /**
  * @since Common Annotations 1.0
  */
+@Documented 
 @Target({ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR,
 ElementType.FIELD, ElementType.LOCAL_VARIABLE, ElementType.METHOD,
 ElementType.PACKAGE, ElementType.PARAMETER, ElementType.TYPE})

Modified: tomcat/trunk/java/javax/annotation/PostConstruct.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/PostConstruct.java?rev=1797338&r1=1797337&r2=1797338&view=diff
==
--- tomcat/trunk/java/javax/annotation/PostConstruct.java (original)
+++ tomcat/trunk/java/javax/annotation/PostConstruct.java Fri Jun  2 09:19:28 
2017
@@ -20,10 +20,12 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
 
 /**
  * @since Common Annotations 1.0
  */
+@Documented 
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface PostConstruct {

Modified: tomcat/trunk/java/javax/annotation/PreDestroy.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/PreDestroy.java?rev=1797338&r1=1797337&r2=1797338&view=diff
==
--- tomcat/trunk/java/javax/annotation/PreDestroy.java (original)
+++ tomcat/trunk/java/javax/annotation/PreDestroy.java Fri Jun  2 09:19:28 2017
@@ -20,10 +20,12 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
 
 /**
  * @since Common Annotations 1.0
  */
+@Documented
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface PreDestroy {

Modified: tomcat/trunk/java/javax/annotation/Priority.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/Priority.java?rev=1797338&r1=1797337&r2=1797338&view=diff
==
--- tomcat/trunk/java/javax/annotation/Priority.java (original)
+++ tomcat/trunk/java/javax/annotation/Priority.java Fri Jun  2 09:19:28 2017
@@ -20,10 +20,12 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
 
 /**
  * @since Common Annotations 1.2
  */
+@Documented
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Priority {

Modified: tomcat/trunk/java/javax/annotation/Resources.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/Resources.java?rev=1797338&r1=1797337&r2=1797338&view=diff
==
--- tomcat/trunk/java/javax/annotation/Resources.java (original)
+++ tomcat/trunk/java/javax/annotation/Resources.java Fri Jun  2 09:19:28 2017
@@ -20,10 +20,12 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
 
 /**
  * @since Common Annotations 1.0
  */
+@Document

svn commit: r1797339 - in /tomcat/tc8.5.x/trunk: ./ java/javax/annotation/ java/javax/annotation/security/ java/org/apache/jasper/compiler/ webapps/docs/

[markt]

Author: markt
Date: Fri Jun  2 09:21:05 2017
New Revision: 1797339

URL: http://svn.apache.org/viewvc?rev=1797339&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61145
Add missing @Documented annotation to annotations in the annotations API. Patch 
provided by Katya Todorova.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/javax/annotation/Generated.java
tomcat/tc8.5.x/trunk/java/javax/annotation/PostConstruct.java
tomcat/tc8.5.x/trunk/java/javax/annotation/PreDestroy.java
tomcat/tc8.5.x/trunk/java/javax/annotation/Priority.java
tomcat/tc8.5.x/trunk/java/javax/annotation/Resources.java
tomcat/tc8.5.x/trunk/java/javax/annotation/security/DeclareRoles.java
tomcat/tc8.5.x/trunk/java/javax/annotation/security/DenyAll.java
tomcat/tc8.5.x/trunk/java/javax/annotation/security/PermitAll.java
tomcat/tc8.5.x/trunk/java/javax/annotation/security/RolesAllowed.java
tomcat/tc8.5.x/trunk/java/javax/annotation/security/RunAs.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Compiler.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun  2 09:21:05 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,1745535,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,1747
 
536,1747924,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-1
 
756410,1756778,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,1759

svn commit: r1797341 - in /tomcat/tc8.0.x/trunk: ./ java/javax/annotation/ java/javax/annotation/security/ java/org/apache/jasper/compiler/ webapps/docs/

[markt]

Author: markt
Date: Fri Jun  2 09:22:16 2017
New Revision: 1797341

URL: http://svn.apache.org/viewvc?rev=1797341&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61145
Add missing @Documented annotation to annotations in the annotations API. Patch 
provided by Katya Todorova.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/javax/annotation/Generated.java
tomcat/tc8.0.x/trunk/java/javax/annotation/PostConstruct.java
tomcat/tc8.0.x/trunk/java/javax/annotation/PreDestroy.java
tomcat/tc8.0.x/trunk/java/javax/annotation/Priority.java
tomcat/tc8.0.x/trunk/java/javax/annotation/Resources.java
tomcat/tc8.0.x/trunk/java/javax/annotation/security/DeclareRoles.java
tomcat/tc8.0.x/trunk/java/javax/annotation/security/DenyAll.java
tomcat/tc8.0.x/trunk/java/javax/annotation/security/PermitAll.java
tomcat/tc8.0.x/trunk/java/javax/annotation/security/RolesAllowed.java
tomcat/tc8.0.x/trunk/java/javax/annotation/security/RunAs.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun  2 09:22:16 2017
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,

Re: asyncError() is not valid while in Async state DISPATCHING

[Violeta Georgieva]

Hi Mark,

2017-05-22 14:28 GMT+03:00 Mark Thomas :
>
> On 10/05/17 20:50, Violeta Georgieva wrote:
> > Hi,
> >
> > 2017-05-02 12:54 GMT+03:00 Violeta Georgieva :
> >>
> >>
> >> 2017-05-02 12:25 GMT+03:00 Mark Thomas :
> >>>
> >>> On 02/05/17 09:52, Violeta Georgieva wrote:
>  Hi,
> 
>  I have a question about Async state DISPATCHING.
> 
>  I have the following scenario
>  - Application invokes startAsync() and then continues processing in a
>  separate non-container thread A.
>  - At some point thread A makes dispatch() -> Async state is changed
to
>  DISPATCHING
>  - At the same time a socket error occurs and thread B tries to change
> >  the
>  Async state to ERROR, as the state was already changed to
> > DISPATCHING, the
>  exception below occurs and the state cannot be changed to ERROR.
> 
>  Isn't that a problem as onError event will not be called?
>  Why don't we treat DISPATCHING as DISPATCHED in asyncError?
> 
> >
https://github.com/apache/tomcat/blob/trunk/java/org/apache/coyote/AsyncStateMachine.java#L388
> >>>
> >>> It depends. (Async errors and threading issues have been a topic of
> >>> discussion in the Servlet EG recently.)
> >>>
> >>> Could you explain a little more about what triggers this?
> >>>
> >>> My initial thoughts are that the socket error should be visible to the
> >>> application and therefore the application should not call dispatch.
> >>
> >> In the described scenario above yes it sees the socket error but even
> > though it calls dispatch.
> >> Don’t we need to ensure onError is called so that if there are
libraries
> > in between (not only server and application) they will receive onError
> > event?
> >
> > What do you think? Is this an issue that requires a fix?
>
> I'm leaning towards thinking this is an application bug.
>
> If the application has two non-container threads, A and B, then, as per
> section 2.3.3.4 of the Servlet spec, the application is responsible for
> accessing the request from those threads in a thread-safe manner.

Yep I agree with the above, but in this scenario we have one non-container
thread A
and the other thread B is actually a container thread that tries to send a
notification for an error.

org.apache.catalina.connector.CoyoteAdapter.asyncDispatch Exception while
processing an asynchronous request
 java.lang.IllegalStateException: Calling [asyncError()] is not valid for a
request with Async state [DISPATCHING]
at org.apache.coyote.AsyncStateMachine.asyncError(
AsyncStateMachine.java:398)
at org.apache.coyote.AbstractProcessor.action(AbstractProcessor.java:393)
at org.apache.coyote.Request.action(Request.java:390)
at org.apache.catalina.core.AsyncContextImpl.setErrorState(
AsyncContextImpl.java:385)
at org.apache.catalina.connector.CoyoteAdapter.asyncDispatch(
CoyoteAdapter.java:175)
at org.apache.coyote.AbstractProcessor.dispatch(AbstractProcessor.java:225)
at org.apache.coyote.AbstractProcessorLight.process(
AbstractProcessorLight.java:53)

What do you think?

Violeta

> In the scenario above, thread A should only call dispatch once the I/O
> activity in thread B has completed.
>
> Alternatively, once thread A has called dispatch, thread B should not be
> performing any I/O.
>
> Mark
>
>
> >
> > Thanks,
> > Violeta
> >
> >>
> >>
> >>> Mark
> >>>
> >>>
> 
>  Thanks,
>  Violeta
> 
>  org.apache.catalina.connector.CoyoteAdapter.asyncDispatch Exception
> > while
>  processing an asynchronous request
> 
>   java.lang.IllegalStateException: Calling [asyncError()] is not valid
> > for a
>  request with Async state [DISPATCHING]
> 
>  at
> 
> >
org.apache.coyote.AsyncStateMachine.asyncError(AsyncStateMachine.java:398)
> 
>  at
> > org.apache.coyote.AbstractProcessor.action(AbstractProcessor.java:393)
> 
>  at org.apache.coyote.Request.action(Request.java:390)
> 
>  at
> 
> >
org.apache.catalina.core.AsyncContextImpl.setErrorState(AsyncContextImpl.java:385)
> 
>  at
> 
> >
org.apache.catalina.connector.CoyoteAdapter.asyncDispatch(CoyoteAdapter.java:175)
> 
>  at
> > org.apache.coyote.AbstractProcessor.dispatch(AbstractProcessor.java:225)
> 
>  at
> 
> >
org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:53)
> 
>  at
> 
> >
org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:796)
> 
>  at
> 
> >
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1366)
> 
>  at
> 
> >
org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)
> 
>  at
> 
> >
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
> 
>  at
> 
> >
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
> 
>  at
> 
> >
org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
>

svn commit: r1797343 - in /tomcat/tc7.0.x/trunk: ./ java/javax/annotation/ java/javax/annotation/security/ webapps/docs/

[markt]

Author: markt
Date: Fri Jun  2 09:23:40 2017
New Revision: 1797343

URL: http://svn.apache.org/viewvc?rev=1797343&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61145
Add missing @Documented annotation to annotations in the annotations API. Patch 
provided by Katya Todorova.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/javax/annotation/Generated.java
tomcat/tc7.0.x/trunk/java/javax/annotation/PostConstruct.java
tomcat/tc7.0.x/trunk/java/javax/annotation/PreDestroy.java
tomcat/tc7.0.x/trunk/java/javax/annotation/Resources.java
tomcat/tc7.0.x/trunk/java/javax/annotation/security/DeclareRoles.java
tomcat/tc7.0.x/trunk/java/javax/annotation/security/DenyAll.java
tomcat/tc7.0.x/trunk/java/javax/annotation/security/PermitAll.java
tomcat/tc7.0.x/trunk/java/javax/annotation/security/RolesAllowed.java
tomcat/tc7.0.x/trunk/java/javax/annotation/security/RunAs.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun  2 09:23:40 2017
@@ -1,3 +1,3 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702
 
742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1725974,1
 
726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,177

Re: svn commit: r1797338 - in /tomcat/trunk: java/javax/annotation/ java/javax/annotation/security/ java/org/apache/jasper/compiler/ webapps/docs/

[Mark Thomas]

On 02/06/2017 10:19, ma...@apache.org wrote:
> Author: markt
> Date: Fri Jun  2 09:19:28 2017
> New Revision: 1797338
> 
> URL: http://svn.apache.org/viewvc?rev=1797338&view=rev
> Log:
> Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61145
> Add missing @Documented annotation to annotations in the annotations API. 
> Patch provided by Katya Todorova.
> 
> Modified:



> tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java

Grr.

This shouldn't have been included. It is the start of my work on BZ
49176. I'll revert it shortly.

Sorry in advance for the noise.

Mark


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

[Bug 61145] Missing @Documented annotation in some javax.annotation classes

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=61145

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #2 from Mark Thomas  ---
Thanks for spotting this and thanks for the patch.

This has been fixed in:
- trunk for 9.0.0.M22 onwards
- 8.5.x for 8.5.16 onwards
- 8.0.x for 8.0.45 onwards
- 7.0.x for 7.0.79 onwards

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1797344 - /tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java

[markt]

Author: markt
Date: Fri Jun  2 09:29:37 2017
New Revision: 1797344

URL: http://svn.apache.org/viewvc?rev=1797344&view=rev
Log:
Revert changes that should not have been included in 1797338

Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java?rev=1797344&r1=1797343&r2=1797344&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java Fri Jun  2 
09:29:37 2017
@@ -68,8 +68,6 @@ public abstract class Compiler {
 
 protected Node.Nodes pageNodes;
 
-private String[] smap;
-
 
 //  Constructor
 
@@ -95,20 +93,6 @@ public abstract class Compiler {
 
 
 /**
- * Obtain the source map for this file. This is cached on compilation. If
- * the process has been restarted since compilation, null will be returned.
- * TODO: Extract the SMAP from the class file if the cached copy is not
- *   available (assumes SMAP is not suppressed)
- *
- * @return The source map in the format it is written to the class file or
- * {@code null} if not available.
- */
-public String[] getSmap() {
-return smap;
-}
-
-
-/**
  * Compile the jsp file into equivalent servlet in .java file
  *
  * @return a smap for the current JSP page, if one is generated, null
@@ -386,7 +370,7 @@ public abstract class Compiler {
 }
 
 try {
-smap = generateJava();
+String[] smap = generateJava();
 File javaFile = new File(ctxt.getServletJavaFileName());
 Long jspLastModified = ctxt.getLastModified(ctxt.getJspFile());
 javaFile.setLastModified(jspLastModified.longValue());



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

svn commit: r1797345 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/jasper/compiler/Compiler.java

[markt]

Author: markt
Date: Fri Jun  2 09:30:27 2017
New Revision: 1797345

URL: http://svn.apache.org/viewvc?rev=1797345&view=rev
Log:
Revert changes that should not have been included in 1797339

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Compiler.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun  2 09:30:27 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,1745535,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,1747
 
536,1747924,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-1
 
756410,1756778,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,176216
 
8,1762172,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,176

svn commit: r1797346 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/jasper/compiler/Compiler.java

[markt]

Author: markt
Date: Fri Jun  2 09:30:55 2017
New Revision: 1797346

URL: http://svn.apache.org/viewvc?rev=1797346&view=rev
Log:
Revert changes that should not have been included in 1797341

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun  2 09:30:55 2017
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
 
7,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687544,1687551,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357

Re: asyncError() is not valid while in Async state DISPATCHING

[Mark Thomas]

On 02/06/2017 10:23, Violeta Georgieva wrote:
> Hi Mark,
> 
> 2017-05-22 14:28 GMT+03:00 Mark Thomas :



>> I'm leaning towards thinking this is an application bug.
>>
>> If the application has two non-container threads, A and B, then, as per
>> section 2.3.3.4 of the Servlet spec, the application is responsible for
>> accessing the request from those threads in a thread-safe manner.
> 
> Yep I agree with the above, but in this scenario we have one non-container
> thread A
> and the other thread B is actually a container thread that tries to send a
> notification for an error.
> 
> org.apache.catalina.connector.CoyoteAdapter.asyncDispatch Exception while
> processing an asynchronous request
>  java.lang.IllegalStateException: Calling [asyncError()] is not valid for a
> request with Async state [DISPATCHING]
> at org.apache.coyote.AsyncStateMachine.asyncError(
> AsyncStateMachine.java:398)
> at org.apache.coyote.AbstractProcessor.action(AbstractProcessor.java:393)
> at org.apache.coyote.Request.action(Request.java:390)
> at org.apache.catalina.core.AsyncContextImpl.setErrorState(
> AsyncContextImpl.java:385)
> at org.apache.catalina.connector.CoyoteAdapter.asyncDispatch(
> CoyoteAdapter.java:175)
> at org.apache.coyote.AbstractProcessor.dispatch(AbstractProcessor.java:225)
> at org.apache.coyote.AbstractProcessorLight.process(
> AbstractProcessorLight.java:53)
> 
> What do you think?

I think I still need more clarity on what is going on. Going back to
your original e-mail, the problems start when:

- At some point thread A makes dispatch() -> Async state is changed
  to DISPATCHING
- At the same time a socket error occurs

The application triggers the dispatch - on its own that is OK. What
triggers the socket error? That means something is performing a read or
write. What triggers that read or write?

Mark


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

[Bug 61146] javax.ejb.EJB doesn't contain lookup method

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=61146

Mark Thomas  changed:

   What|Removed |Added

  Attachment #35027|0   |1
   is patch||
  Attachment #35027|application/mbox|text/plain
  mime type||

--- Comment #1 from Mark Thomas  ---
Comment on attachment 35027
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=35027
Patch validated against tomcat tests and the corresponding specification

Fix MIME type for patch

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: asyncError() is not valid while in Async state DISPATCHING

[Violeta Georgieva]

2017-06-02 12:37 GMT+03:00 Mark Thomas :
>
> On 02/06/2017 10:23, Violeta Georgieva wrote:
> > Hi Mark,
> >
> > 2017-05-22 14:28 GMT+03:00 Mark Thomas :
>
> 
>
> >> I'm leaning towards thinking this is an application bug.
> >>
> >> If the application has two non-container threads, A and B, then, as per
> >> section 2.3.3.4 of the Servlet spec, the application is responsible for
> >> accessing the request from those threads in a thread-safe manner.
> >
> > Yep I agree with the above, but in this scenario we have one
non-container
> > thread A
> > and the other thread B is actually a container thread that tries to
send a
> > notification for an error.
> >
> > org.apache.catalina.connector.CoyoteAdapter.asyncDispatch Exception
while
> > processing an asynchronous request
> >  java.lang.IllegalStateException: Calling [asyncError()] is not valid
for a
> > request with Async state [DISPATCHING]
> > at org.apache.coyote.AsyncStateMachine.asyncError(
> > AsyncStateMachine.java:398)
> > at
org.apache.coyote.AbstractProcessor.action(AbstractProcessor.java:393)
> > at org.apache.coyote.Request.action(Request.java:390)
> > at org.apache.catalina.core.AsyncContextImpl.setErrorState(
> > AsyncContextImpl.java:385)
> > at org.apache.catalina.connector.CoyoteAdapter.asyncDispatch(
> > CoyoteAdapter.java:175)
> > at
org.apache.coyote.AbstractProcessor.dispatch(AbstractProcessor.java:225)
> > at org.apache.coyote.AbstractProcessorLight.process(
> > AbstractProcessorLight.java:53)
> >
> > What do you think?
>
> I think I still need more clarity on what is going on. Going back to
> your original e-mail, the problems start when:
>
> - At some point thread A makes dispatch() -> Async state is changed
>   to DISPATCHING
> - At the same time a socket error occurs

Client closes the connection while the application is writing the response.

> The application triggers the dispatch - on its own that is OK. What
> triggers the socket error? That means something is performing a read or
> write. What triggers that read or write?
>
> Mark
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

svn commit: r1797354 - in /tomcat/trunk/java/javax/annotation: ./ security/

[markt]

Author: markt
Date: Fri Jun  2 09:48:02 2017
New Revision: 1797354

URL: http://svn.apache.org/viewvc?rev=1797354&view=rev
Log:
Correct import order

Modified:
tomcat/trunk/java/javax/annotation/Generated.java
tomcat/trunk/java/javax/annotation/PostConstruct.java
tomcat/trunk/java/javax/annotation/PreDestroy.java
tomcat/trunk/java/javax/annotation/Priority.java
tomcat/trunk/java/javax/annotation/Resources.java
tomcat/trunk/java/javax/annotation/security/DeclareRoles.java
tomcat/trunk/java/javax/annotation/security/DenyAll.java
tomcat/trunk/java/javax/annotation/security/PermitAll.java
tomcat/trunk/java/javax/annotation/security/RolesAllowed.java
tomcat/trunk/java/javax/annotation/security/RunAs.java

Modified: tomcat/trunk/java/javax/annotation/Generated.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/Generated.java?rev=1797354&r1=1797353&r2=1797354&view=diff
==
--- tomcat/trunk/java/javax/annotation/Generated.java (original)
+++ tomcat/trunk/java/javax/annotation/Generated.java Fri Jun  2 09:48:02 2017
@@ -16,16 +16,16 @@
  */
 package javax.annotation;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
 
 /**
  * @since Common Annotations 1.0
  */
-@Documented 
+@Documented
 @Target({ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR,
 ElementType.FIELD, ElementType.LOCAL_VARIABLE, ElementType.METHOD,
 ElementType.PACKAGE, ElementType.PARAMETER, ElementType.TYPE})

Modified: tomcat/trunk/java/javax/annotation/PostConstruct.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/PostConstruct.java?rev=1797354&r1=1797353&r2=1797354&view=diff
==
--- tomcat/trunk/java/javax/annotation/PostConstruct.java (original)
+++ tomcat/trunk/java/javax/annotation/PostConstruct.java Fri Jun  2 09:48:02 
2017
@@ -16,16 +16,16 @@
  */
 package javax.annotation;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
 
 /**
  * @since Common Annotations 1.0
  */
-@Documented 
+@Documented
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface PostConstruct {

Modified: tomcat/trunk/java/javax/annotation/PreDestroy.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/PreDestroy.java?rev=1797354&r1=1797353&r2=1797354&view=diff
==
--- tomcat/trunk/java/javax/annotation/PreDestroy.java (original)
+++ tomcat/trunk/java/javax/annotation/PreDestroy.java Fri Jun  2 09:48:02 2017
@@ -16,11 +16,11 @@
  */
 package javax.annotation;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
 
 /**
  * @since Common Annotations 1.0

Modified: tomcat/trunk/java/javax/annotation/Priority.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/Priority.java?rev=1797354&r1=1797353&r2=1797354&view=diff
==
--- tomcat/trunk/java/javax/annotation/Priority.java (original)
+++ tomcat/trunk/java/javax/annotation/Priority.java Fri Jun  2 09:48:02 2017
@@ -16,11 +16,11 @@
  */
 package javax.annotation;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
 
 /**
  * @since Common Annotations 1.2

Modified: tomcat/trunk/java/javax/annotation/Resources.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/Resources.java?rev=1797354&r1=1797353&r2=1797354&view=diff
==
--- tomcat/trunk/java/javax/annotation/Resources.java (original)
+++ tomcat/trunk/java/javax/annotation/Resources.java Fri Jun  2 09:48:02 2017
@@ -16,11 +16,11 @@
  */
 package javax.annotation;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
 
 /**
  * @since Common Annotations 1.0

Modified: tomcat/trunk/java/javax/annotation/security/DeclareRoles.java
URL: 
http://svn

svn commit: r1797355 - in /tomcat/trunk: java/javax/ejb/EJB.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Fri Jun  2 09:48:44 2017
New Revision: 1797355

URL: http://svn.apache.org/viewvc?rev=1797355&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61146
Add missing lookup() method to @EJB annotation in the annotations API.
Patch provided by Katya Todorova.

Modified:
tomcat/trunk/java/javax/ejb/EJB.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/javax/ejb/EJB.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/ejb/EJB.java?rev=1797355&r1=1797354&r2=1797355&view=diff
==
--- tomcat/trunk/java/javax/ejb/EJB.java (original)
+++ tomcat/trunk/java/javax/ejb/EJB.java Fri Jun  2 09:48:44 2017
@@ -33,4 +33,5 @@ public @interface EJB {
Class beanInterface() default java.lang.Object.class;
String beanName() default "";
String mappedName() default "";
+   String lookup() default "";
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1797355&r1=1797354&r2=1797355&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jun  2 09:48:44 2017
@@ -143,6 +143,11 @@
 annotations in the annotations API. Patch provided by Katya Todorova.
 (markt)
   
+  
+61146: Add missing lookup() method to
+@EJB annotation in the annotations API. Patch provided by
+Katya Todorova. (markt)
+  
 
   
 



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

svn commit: r1797357 - in /tomcat/tc8.5.x/trunk/java/javax/annotation: ./ security/

[markt]

Author: markt
Date: Fri Jun  2 09:49:39 2017
New Revision: 1797357

URL: http://svn.apache.org/viewvc?rev=1797357&view=rev
Log:
Correct import order

Modified:
tomcat/tc8.5.x/trunk/java/javax/annotation/Generated.java
tomcat/tc8.5.x/trunk/java/javax/annotation/PostConstruct.java
tomcat/tc8.5.x/trunk/java/javax/annotation/PreDestroy.java
tomcat/tc8.5.x/trunk/java/javax/annotation/Priority.java
tomcat/tc8.5.x/trunk/java/javax/annotation/Resources.java
tomcat/tc8.5.x/trunk/java/javax/annotation/security/DeclareRoles.java
tomcat/tc8.5.x/trunk/java/javax/annotation/security/DenyAll.java
tomcat/tc8.5.x/trunk/java/javax/annotation/security/PermitAll.java
tomcat/tc8.5.x/trunk/java/javax/annotation/security/RolesAllowed.java
tomcat/tc8.5.x/trunk/java/javax/annotation/security/RunAs.java

Modified: tomcat/tc8.5.x/trunk/java/javax/annotation/Generated.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/annotation/Generated.java?rev=1797357&r1=1797356&r2=1797357&view=diff
==
--- tomcat/tc8.5.x/trunk/java/javax/annotation/Generated.java (original)
+++ tomcat/tc8.5.x/trunk/java/javax/annotation/Generated.java Fri Jun  2 
09:49:39 2017
@@ -16,16 +16,16 @@
  */
 package javax.annotation;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
 
 /**
  * @since Common Annotations 1.0
  */
-@Documented 
+@Documented
 @Target({ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR,
 ElementType.FIELD, ElementType.LOCAL_VARIABLE, ElementType.METHOD,
 ElementType.PACKAGE, ElementType.PARAMETER, ElementType.TYPE})

Modified: tomcat/tc8.5.x/trunk/java/javax/annotation/PostConstruct.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/annotation/PostConstruct.java?rev=1797357&r1=1797356&r2=1797357&view=diff
==
--- tomcat/tc8.5.x/trunk/java/javax/annotation/PostConstruct.java (original)
+++ tomcat/tc8.5.x/trunk/java/javax/annotation/PostConstruct.java Fri Jun  2 
09:49:39 2017
@@ -16,16 +16,16 @@
  */
 package javax.annotation;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
 
 /**
  * @since Common Annotations 1.0
  */
-@Documented 
+@Documented
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface PostConstruct {

Modified: tomcat/tc8.5.x/trunk/java/javax/annotation/PreDestroy.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/annotation/PreDestroy.java?rev=1797357&r1=1797356&r2=1797357&view=diff
==
--- tomcat/tc8.5.x/trunk/java/javax/annotation/PreDestroy.java (original)
+++ tomcat/tc8.5.x/trunk/java/javax/annotation/PreDestroy.java Fri Jun  2 
09:49:39 2017
@@ -16,11 +16,11 @@
  */
 package javax.annotation;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
 
 /**
  * @since Common Annotations 1.0

Modified: tomcat/tc8.5.x/trunk/java/javax/annotation/Priority.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/annotation/Priority.java?rev=1797357&r1=1797356&r2=1797357&view=diff
==
--- tomcat/tc8.5.x/trunk/java/javax/annotation/Priority.java (original)
+++ tomcat/tc8.5.x/trunk/java/javax/annotation/Priority.java Fri Jun  2 
09:49:39 2017
@@ -16,11 +16,11 @@
  */
 package javax.annotation;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
 
 /**
  * @since Common Annotations 1.2

Modified: tomcat/tc8.5.x/trunk/java/javax/annotation/Resources.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/javax/annotation/Resources.java?rev=1797357&r1=1797356&r2=1797357&view=diff
==
--- tomcat/tc8.5.x/trunk/java/javax/annotation/Resources.java (original)
+++ tomcat/tc8.5.x/trunk/java/javax/annotation/Resources.java Fri Jun  2 
09:49:39 2017
@@ -16,11 +16,11 @@
  */
 package javax.annotation;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import ja

svn commit: r1797358 - in /tomcat/tc8.5.x/trunk: ./ java/javax/ejb/EJB.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Fri Jun  2 09:50:27 2017
New Revision: 1797358

URL: http://svn.apache.org/viewvc?rev=1797358&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61146
Add missing lookup() method to @EJB annotation in the annotations API.
Patch provided by Katya Todorova.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/javax/ejb/EJB.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun  2 09:50:27 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,1745535,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,1747
 
536,1747924,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-1
 
756410,1756778,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,176216
 
8,1762172,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,

svn commit: r1797359 - in /tomcat/tc8.0.x/trunk/java/javax/annotation: ./ security/

[markt]

Author: markt
Date: Fri Jun  2 09:51:13 2017
New Revision: 1797359

URL: http://svn.apache.org/viewvc?rev=1797359&view=rev
Log:
Correct import order

Modified:
tomcat/tc8.0.x/trunk/java/javax/annotation/Generated.java
tomcat/tc8.0.x/trunk/java/javax/annotation/PostConstruct.java
tomcat/tc8.0.x/trunk/java/javax/annotation/PreDestroy.java
tomcat/tc8.0.x/trunk/java/javax/annotation/Priority.java
tomcat/tc8.0.x/trunk/java/javax/annotation/Resources.java
tomcat/tc8.0.x/trunk/java/javax/annotation/security/DeclareRoles.java
tomcat/tc8.0.x/trunk/java/javax/annotation/security/DenyAll.java
tomcat/tc8.0.x/trunk/java/javax/annotation/security/PermitAll.java
tomcat/tc8.0.x/trunk/java/javax/annotation/security/RolesAllowed.java
tomcat/tc8.0.x/trunk/java/javax/annotation/security/RunAs.java

Modified: tomcat/tc8.0.x/trunk/java/javax/annotation/Generated.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/javax/annotation/Generated.java?rev=1797359&r1=1797358&r2=1797359&view=diff
==
--- tomcat/tc8.0.x/trunk/java/javax/annotation/Generated.java (original)
+++ tomcat/tc8.0.x/trunk/java/javax/annotation/Generated.java Fri Jun  2 
09:51:13 2017
@@ -16,16 +16,16 @@
  */
 package javax.annotation;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
 
 /**
  * @since Common Annotations 1.0
  */
-@Documented 
+@Documented
 @Target({ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR,
 ElementType.FIELD, ElementType.LOCAL_VARIABLE, ElementType.METHOD,
 ElementType.PACKAGE, ElementType.PARAMETER, ElementType.TYPE})

Modified: tomcat/tc8.0.x/trunk/java/javax/annotation/PostConstruct.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/javax/annotation/PostConstruct.java?rev=1797359&r1=1797358&r2=1797359&view=diff
==
--- tomcat/tc8.0.x/trunk/java/javax/annotation/PostConstruct.java (original)
+++ tomcat/tc8.0.x/trunk/java/javax/annotation/PostConstruct.java Fri Jun  2 
09:51:13 2017
@@ -16,16 +16,16 @@
  */
 package javax.annotation;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
 
 /**
  * @since Common Annotations 1.0
  */
-@Documented 
+@Documented
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface PostConstruct {

Modified: tomcat/tc8.0.x/trunk/java/javax/annotation/PreDestroy.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/javax/annotation/PreDestroy.java?rev=1797359&r1=1797358&r2=1797359&view=diff
==
--- tomcat/tc8.0.x/trunk/java/javax/annotation/PreDestroy.java (original)
+++ tomcat/tc8.0.x/trunk/java/javax/annotation/PreDestroy.java Fri Jun  2 
09:51:13 2017
@@ -16,11 +16,11 @@
  */
 package javax.annotation;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
 
 /**
  * @since Common Annotations 1.0

Modified: tomcat/tc8.0.x/trunk/java/javax/annotation/Priority.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/javax/annotation/Priority.java?rev=1797359&r1=1797358&r2=1797359&view=diff
==
--- tomcat/tc8.0.x/trunk/java/javax/annotation/Priority.java (original)
+++ tomcat/tc8.0.x/trunk/java/javax/annotation/Priority.java Fri Jun  2 
09:51:13 2017
@@ -16,11 +16,11 @@
  */
 package javax.annotation;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
 
 /**
  * @since Common Annotations 1.2

Modified: tomcat/tc8.0.x/trunk/java/javax/annotation/Resources.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/javax/annotation/Resources.java?rev=1797359&r1=1797358&r2=1797359&view=diff
==
--- tomcat/tc8.0.x/trunk/java/javax/annotation/Resources.java (original)
+++ tomcat/tc8.0.x/trunk/java/javax/annotation/Resources.java Fri Jun  2 
09:51:13 2017
@@ -16,11 +16,11 @@
  */
 package javax.annotation;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import ja

svn commit: r1797360 - in /tomcat/tc8.0.x/trunk: ./ java/javax/ejb/EJB.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Fri Jun  2 09:51:59 2017
New Revision: 1797360

URL: http://svn.apache.org/viewvc?rev=1797360&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61146
Add missing lookup() method to @EJB annotation in the annotations API.
Patch provided by Katya Todorova.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/javax/ejb/EJB.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun  2 09:51:59 2017
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
 
7,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,1685

svn commit: r1797361 - in /tomcat/tc7.0.x/trunk/java/javax/annotation: Generated.java PostConstruct.java PreDestroy.java Resources.java security/DeclareRoles.java security/DenyAll.java security/Permit

[markt]

Author: markt
Date: Fri Jun  2 09:53:41 2017
New Revision: 1797361

URL: http://svn.apache.org/viewvc?rev=1797361&view=rev
Log:
Correct import order

Modified:
tomcat/tc7.0.x/trunk/java/javax/annotation/Generated.java
tomcat/tc7.0.x/trunk/java/javax/annotation/PostConstruct.java
tomcat/tc7.0.x/trunk/java/javax/annotation/PreDestroy.java
tomcat/tc7.0.x/trunk/java/javax/annotation/Resources.java
tomcat/tc7.0.x/trunk/java/javax/annotation/security/DeclareRoles.java
tomcat/tc7.0.x/trunk/java/javax/annotation/security/DenyAll.java
tomcat/tc7.0.x/trunk/java/javax/annotation/security/PermitAll.java
tomcat/tc7.0.x/trunk/java/javax/annotation/security/RolesAllowed.java
tomcat/tc7.0.x/trunk/java/javax/annotation/security/RunAs.java

Modified: tomcat/tc7.0.x/trunk/java/javax/annotation/Generated.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/annotation/Generated.java?rev=1797361&r1=1797360&r2=1797361&view=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/annotation/Generated.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/annotation/Generated.java Fri Jun  2 
09:53:41 2017
@@ -16,16 +16,16 @@
  */
 package javax.annotation;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
 
 /**
  * @since Common Annotations 1.0
  */
-@Documented 
+@Documented
 @Target({ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR,
 ElementType.FIELD, ElementType.LOCAL_VARIABLE, ElementType.METHOD,
 ElementType.PACKAGE, ElementType.PARAMETER, ElementType.TYPE})

Modified: tomcat/tc7.0.x/trunk/java/javax/annotation/PostConstruct.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/annotation/PostConstruct.java?rev=1797361&r1=1797360&r2=1797361&view=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/annotation/PostConstruct.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/annotation/PostConstruct.java Fri Jun  2 
09:53:41 2017
@@ -16,16 +16,16 @@
  */
 package javax.annotation;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
 
 /**
  * @since Common Annotations 1.0
  */
-@Documented 
+@Documented
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface PostConstruct {

Modified: tomcat/tc7.0.x/trunk/java/javax/annotation/PreDestroy.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/annotation/PreDestroy.java?rev=1797361&r1=1797360&r2=1797361&view=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/annotation/PreDestroy.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/annotation/PreDestroy.java Fri Jun  2 
09:53:41 2017
@@ -16,11 +16,11 @@
  */
 package javax.annotation;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
 
 /**
  * @since Common Annotations 1.0

Modified: tomcat/tc7.0.x/trunk/java/javax/annotation/Resources.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/annotation/Resources.java?rev=1797361&r1=1797360&r2=1797361&view=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/annotation/Resources.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/annotation/Resources.java Fri Jun  2 
09:53:41 2017
@@ -16,11 +16,11 @@
  */
 package javax.annotation;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
 
 /**
  * @since Common Annotations 1.0

Modified: tomcat/tc7.0.x/trunk/java/javax/annotation/security/DeclareRoles.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/annotation/security/DeclareRoles.java?rev=1797361&r1=1797360&r2=1797361&view=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/annotation/security/DeclareRoles.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/javax/annotation/security/DeclareRoles.java Fri 
Jun  2 09:53:41 2017
@@ -16,11 +16,11 @@
  */
 package javax.annotation.security;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import j

svn commit: r1797363 - in /tomcat/tc7.0.x/trunk: ./ java/javax/ejb/EJB.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Fri Jun  2 09:54:12 2017
New Revision: 1797363

URL: http://svn.apache.org/viewvc?rev=1797363&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61146
Add missing lookup() method to @EJB annotation in the annotations API.
Patch provided by Katya Todorova.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/javax/ejb/EJB.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun  2 09:54:12 2017
@@ -1,3 +1,3 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702
 
742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1725974,1
 
726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906
-/tomcat/tc8.5.x/trunk:1735579,1736839,1737199,1737966,1738042,1738044,1738162,1738165,1738178,1739157,1739173,1739177,1739476,1740132,1740521,1740536,1740804,1740811,1740981,1741165,1741174,1741182,1741191,1741203,1741209,1741226,1741233,1741410,1742277,1743118,1743126,1743139-1743140,1743718,1743722,1743724,1744059,1744127,1744151,1744232,1744377,1744687,1744698,1744706,1745228,1746940,1748548,1748716,1749288,1749375,1749668-1749669,1750016,1750057

[Bug 61146] javax.ejb.EJB doesn't contain lookup method

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=61146

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #2 from Mark Thomas  ---
Thanks for spotting this and thanks for the patch.

This has been fixed in:
- trunk for 9.0.0.M22 onwards
- 8.5.x for 8.5.16 onwards
- 8.0.x for 8.0.45 onwards
- 7.0.x for 7.0.79 onwards

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Announcing: Early-Access builds of JDK 9 for Alpine Linux/musl at jdk.java.net/9/

[Rory O'Donnell]

Hi Mark, *
* **

*Announcing: Early-Access builds of JDK 9 for Alpine Linux/musl at  
jdk.java.net/9/ [1]

*

 * As of today there are pre-built Early-Access (EA) JDK binaries for
   Alpine Linux/musl at  jdk.java.net/9/**
 o look for “Alpine Linux”. [1]
 * The Alpine Linux build is compatible with linux distributions that
   use the musl C library. *[2]*

Feedback is very welcome via the portola-dev mailing list, remembering 
to subscribe to the mailing list first.



*Proposed schedule change for JDK 9 [3]*

   JDK 9 Project continues to work toward the current goal of producing
   an initial Release Candidate build on 22 June.
   This proposal is to adjust the GA date in order to accommodate the
   additional time required to move through the JCP process.
   To be specific, we propose to move the GA date out by eight weeks,
   from 27 July to 21 September. 



Rgds,Rory


[1] http://mail.openjdk.java.net/pipermail/portola-dev/2017-June/000191.html
[2] http://www.musl-libc.org/
[3] http://mail.openjdk.java.net/pipermail/jdk9-dev/2017-May/005864.html

--
Rgds,Rory O'Donnell
Quality Engineering Manager
Oracle EMEA , Dublin, Ireland

buildbot success in on tomcat-8-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-8-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-8-trunk/builds/1023

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1797360
Blamelist: markt

Build succeeded!

Sincerely,
 -The Buildbot




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

svn commit: r1797369 - in /tomcat/site/trunk: docs/lists.html xdocs/lists.xml

[violetagg]

Author: violetagg
Date: Fri Jun  2 11:07:15 2017
New Revision: 1797369

URL: http://svn.apache.org/viewvc?rev=1797369&view=rev
Log:
Update links to Nabble

Modified:
tomcat/site/trunk/docs/lists.html
tomcat/site/trunk/xdocs/lists.xml

Modified: tomcat/site/trunk/docs/lists.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/lists.html?rev=1797369&r1=1797368&r2=1797369&view=diff
==
--- tomcat/site/trunk/docs/lists.html (original)
+++ tomcat/site/trunk/docs/lists.html Fri Jun  2 11:07:15 2017
@@ -459,7 +459,7 @@ Tomcat questions to Eric or Rick themsel
 Apache, at
 http://marc.info/?l=tomcat-user"; rel="nofollow">MARC 
(searchable), at
 http://markmail.org/list/org.apache.tomcat.user/"; 
rel="nofollow">MarkMail, at
-http://old.nabble.com/Tomcat---User-f342.html"; 
rel="nofollow">Nabble and at
+http://tomcat.10.x6.nabble.com/Tomcat-User-f1968778.html"; 
rel="nofollow">Nabble and at
 http://www.mail-archive.com/users@tomcat.apache.org/"; 
rel="nofollow">Mail Archive
   
  
@@ -659,7 +659,7 @@ issues. Other questions will be ignored.
 Apache, at
 http://marc.info/?l=tomcat-dev"; rel="nofollow">MARC (searchable) 
, at
 http://markmail.org/list/org.apache.tomcat.dev/"; 
rel="nofollow">MarkMail, at
-http://old.nabble.com/Tomcat---Dev-f341.html"; 
rel="nofollow">Nabble and at
+http://tomcat.10.x6.nabble.com/Tomcat-Dev-f2176423.html"; 
rel="nofollow">Nabble and at
 http://www.mail-archive.com/dev@tomcat.apache.org/"; 
rel="nofollow">Mail Archive
   
  

Modified: tomcat/site/trunk/xdocs/lists.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/lists.xml?rev=1797369&r1=1797368&r2=1797369&view=diff
==
--- tomcat/site/trunk/xdocs/lists.xml (original)
+++ tomcat/site/trunk/xdocs/lists.xml Fri Jun  2 11:07:15 2017
@@ -158,7 +158,7 @@ Tomcat questions to Eric or Rick themsel
 rel="nofollow">MARC (searchable), at
 http://markmail.org/list/org.apache.tomcat.user/";
 rel="nofollow">MarkMail, at
-http://old.nabble.com/Tomcat---User-f342.html";
+http://tomcat.10.x6.nabble.com/Tomcat-User-f1968778.html";
 rel="nofollow">Nabble and at
 http://www.mail-archive.com/users@tomcat.apache.org/";
 rel="nofollow">Mail Archive
@@ -303,7 +303,7 @@ issues. Other questions will be ignored.
 rel="nofollow">MARC (searchable) , at
 http://markmail.org/list/org.apache.tomcat.dev/";
 rel="nofollow">MarkMail, at
-http://old.nabble.com/Tomcat---Dev-f341.html";
+http://tomcat.10.x6.nabble.com/Tomcat-Dev-f2176423.html";
 rel="nofollow">Nabble and at
 http://www.mail-archive.com/dev@tomcat.apache.org/";
 rel="nofollow">Mail Archive



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

[GitHub] tomcat pull request #:

[powerYao]

Github user powerYao commented on the pull request:


https://github.com/apache/tomcat/commit/d91d7a802b67ab049b33df9db017ef31d3247450#commitcomment-22377283
  
why the origin code hava ( ) ?


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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

Merging GitHub PR into svn

[Christopher Schultz]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

All,

I've never done this before, and my git-fu is not strong.

What's the best way to take a GitHub PR and merge it into e.g. Tomcat
trunk? I can definitely do it like this:

1. Grab the PR and convert it into a patch file
2. Apply the patch to my local svn checkout
3. Commit to svn
4. Reply to PR email saying something like "this closes PR #X"

Is there a smoother way to do this?

Command-line recipes preferred, but I can also use Eclipse if that
helps somehow.

Thanks,
- -chris
-BEGIN PGP SIGNATURE-
Comment: GPGTools - http://gpgtools.org
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBCAAGBQJZMWbSAAoJEBzwKT+lPKRYa94QAMDkr4INaaP5NZPGuFefNTl5
aedKKjZ5EmpYFUbL18F4hqXxcYkK41UTvY3vDVjehKjQEoaP2g3Zwla34dCDzV7t
KE1wnXjb46Ej2bNvlN7LVDUclmeRrgSY7pSTUsEILOyTHfQ/74uDO5fV0o2rnyuK
CipY4B9aAVt957ejmITjuN/nTCQcR8Fg6d4hjjGbH8hN8G9W5Y1iXyFCjF5e5a0x
4tijqlgkVRJ6CbpE7z0QjGebvMZ3WjXIf2G41ZJKrqXP94/Rx+GGdlteXwe9f9IR
yCAnc4DCo1xIXp4A4CAA4Z+qGInDmZlrCkyPWCLFavQh8UpYUJdH0YVmdSHjw79K
6h7Ont4t1y1nan1m5LZlpvpnHeUljJ7vnQ0moBMGurfiHHfyiCY2I/Tw9A/7jJrL
4Eog+D6RbCsbVclb8fML8EpNGXtRPscGN39Td/AIOho+4aY+rRZWFt8PlDKj8XUX
FK2rJfbhd6KH6QDicNpadpAOegwzePVrxpKRGVNc6bYVFTnfRNHtERZUHbTv3Sd0
ni6lbVVL2LPRYgn/mHcDAtWk0Qj4172mVKRhY+Um/VcivSKj5o2Wy9FT6ydVDC+m
XeD8MdRx59cuqjJZy10nGwB12/M0UCOabrvGdiVDGwT5XGWKpy7flxsWJrByEqZY
SeQ6WAgmTeftrH1E1nkK
=b7Fb
-END PGP SIGNATURE-

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

Re: Merging GitHub PR into svn

[Mark Thomas]

On 2 June 2017 14:23:30 BST, Christopher Schultz  
wrote:
>All,
>
>I've never done this before, and my git-fu is not strong.
>
>What's the best way to take a GitHub PR and merge it into e.g. Tomcat
>trunk? I can definitely do it like this:
>
>1. Grab the PR and convert it into a patch file

Add .patch to the PR url and GitHub will give you a patch file.

>2. Apply the patch to my local svn checkout
>3. Commit to svn
>4. Reply to PR email saying something like "this closes PR #X"
>
>Is there a smoother way to do this?

Probably, but the process above is what I tend to do.

Mark


>
>Command-line recipes preferred, but I can also use Eclipse if that
>helps somehow.
>
>Thanks,
>-chris


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

[GitHub] tomcat pull request #:

[ChristopherSchultz]

Github user ChristopherSchultz commented on the pull request:


https://github.com/apache/tomcat/commit/d91d7a802b67ab049b33df9db017ef31d3247450#commitcomment-22378483
  
@powerYao Because in the distant past, someone decided that having those 
extra parentheses was good coding style.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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

Re: Merging GitHub PR into svn

[Violeta Georgieva]

2017-06-02 16:23 GMT+03:00 Christopher Schultz :
>
> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA256
>
> All,
>
> I've never done this before, and my git-fu is not strong.
>
> What's the best way to take a GitHub PR and merge it into e.g. Tomcat
> trunk? I can definitely do it like this:
>
> 1. Grab the PR and convert it into a patch file

In the mail notification from Github there is link to the patch

e.g.

"Patch Links:

https://github.com/apache/tomcat/pull/57.patch
https://github.com/apache/tomcat/pull/57.diff
"
http://marc.info/?l=tomcat-dev&m=149630485823205&w=2

> 2. Apply the patch to my local svn checkout
> 3. Commit to svn
> 4. Reply to PR email saying something like "this closes PR #X"

Typically when I commit, I include to the commit message this "This closes
#X" and the PR is closed automatically.

e.g.
http://marc.info/?l=tomcat-dev&m=149631671227003&w=2

Violeta

>
> Is there a smoother way to do this?
>
> Command-line recipes preferred, but I can also use Eclipse if that
> helps somehow.
>
> Thanks,
> - -chris
> -BEGIN PGP SIGNATURE-
> Comment: GPGTools - http://gpgtools.org
> Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
>
> iQIcBAEBCAAGBQJZMWbSAAoJEBzwKT+lPKRYa94QAMDkr4INaaP5NZPGuFefNTl5
> aedKKjZ5EmpYFUbL18F4hqXxcYkK41UTvY3vDVjehKjQEoaP2g3Zwla34dCDzV7t
> KE1wnXjb46Ej2bNvlN7LVDUclmeRrgSY7pSTUsEILOyTHfQ/74uDO5fV0o2rnyuK
> CipY4B9aAVt957ejmITjuN/nTCQcR8Fg6d4hjjGbH8hN8G9W5Y1iXyFCjF5e5a0x
> 4tijqlgkVRJ6CbpE7z0QjGebvMZ3WjXIf2G41ZJKrqXP94/Rx+GGdlteXwe9f9IR
> yCAnc4DCo1xIXp4A4CAA4Z+qGInDmZlrCkyPWCLFavQh8UpYUJdH0YVmdSHjw79K
> 6h7Ont4t1y1nan1m5LZlpvpnHeUljJ7vnQ0moBMGurfiHHfyiCY2I/Tw9A/7jJrL
> 4Eog+D6RbCsbVclb8fML8EpNGXtRPscGN39Td/AIOho+4aY+rRZWFt8PlDKj8XUX
> FK2rJfbhd6KH6QDicNpadpAOegwzePVrxpKRGVNc6bYVFTnfRNHtERZUHbTv3Sd0
> ni6lbVVL2LPRYgn/mHcDAtWk0Qj4172mVKRhY+Um/VcivSKj5o2Wy9FT6ydVDC+m
> XeD8MdRx59cuqjJZy10nGwB12/M0UCOabrvGdiVDGwT5XGWKpy7flxsWJrByEqZY
> SeQ6WAgmTeftrH1E1nkK
> =b7Fb
> -END PGP SIGNATURE-
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

Re: Merging GitHub PR into svn

[Christopher Schultz]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Violetta,

On 6/2/17 9:43 AM, Violeta Georgieva wrote:
> 2017-06-02 16:23 GMT+03:00 Christopher Schultz
> > :
>> 
> All,
> 
> I've never done this before, and my git-fu is not strong.
> 
> What's the best way to take a GitHub PR and merge it into e.g.
> Tomcat trunk? I can definitely do it like this:
> 
> 1. Grab the PR and convert it into a patch file
> 
>> In the mail notification from Github there is link to the patch
> 
>> e.g.
> 
>> "Patch Links:
> 
>> https://github.com/apache/tomcat/pull/57.patch 
>> https://github.com/apache/tomcat/pull/57.diff " 
>> http://marc.info/?l=tomcat-dev&m=149630485823205&w=2

I don't see any links like that in the emails from GitHub. For example:

http://marc.info/?l=tomcat-dev&m=149635560007375&w=2

I can just add ".patch" to the end of the PR URL as Mark suggested, of
course.

> 2. Apply the patch to my local svn checkout 3. Commit to svn 4.
> Reply to PR email saying something like "this closes PR #X"
> 
>> Typically when I commit, I include to the commit message this
>> "This closes #X" and the PR is closed automatically.

Is GitHub watching our mailing list for commits? If I do an "svn
commit" and merely mention "This closes #57", how does GitHub know
which GitHub user's "issue #57" it belongs to?

I'm just trying to understand how this all works.

Thanks,
- -chris
-BEGIN PGP SIGNATURE-
Comment: GPGTools - http://gpgtools.org
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBCAAGBQJZMW2kAAoJEBzwKT+lPKRYAIUP/3uCQBx/1tpw0ZpppuuHrIi2
Snf9gFfeh4ypuPiGWZGeh7zrwf6CwJ/mZelWnZFC8FLHAEuvk+1BRt/r2qXL4/YG
k4XimMqQ/+2yWpqHAI/UNYJbxiboMOolusvNPb1oZj6WLA8CNPE0QghkKVxpeqh9
Tk3+rOHtQ/yXynwMyArFOzLqtXtu9odBwJ/aG7G3HWEH4bNREy/O/ZpzG3koChGK
ylfwhvlyvolScNJ6FLoKCKC10+PruG+nK8ftiIh74Z68P137qpYCyWJz4VOJOnFb
SddDgM7YemRsj4avYq6jSYCRL24Dl3yDIvSzjBB+86lgMH/+0VnZSBWLibR/HtfF
DRSMn29XZAMBoinv6z9cdVeboL4JdNqpS6u30NMMZ/clpg6218UZP5zkkjYg1hPZ
tKYW3I/TRu6oYs/kqG4JXmwAFv9XD79QQQ2SOsIlDMgSIVlgE6o/MNlOKJ+RNVZJ
25uPjQ1PyJv/MHFaH2WopNftP3+RcGmpTQDxepIvcpyDecv95MUzbSpey2IiqPHV
soErf1OSHDsJ0EU2aXT6GFaSJz3oj0R+RiJ43Jwrg5EKMDSJaeayRCFEUIRX+wH8
uO04boCH5N+fX68uby+1tRoowEJRgQ8PONR1VSRA4fFoa3K/YI1+a5wcQznMl64V
t32pSDqu9VtG2sWOLrod
=Hf0m
-END PGP SIGNATURE-

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

Re: Merging GitHub PR into svn

[Violeta Georgieva]

2017-06-02 16:52 GMT+03:00 Christopher Schultz :
>
> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA256
>
> Violetta,
>
> On 6/2/17 9:43 AM, Violeta Georgieva wrote:
> > 2017-06-02 16:23 GMT+03:00 Christopher Schultz
> >  >> :
> >>
> > All,
> >
> > I've never done this before, and my git-fu is not strong.
> >
> > What's the best way to take a GitHub PR and merge it into e.g.
> > Tomcat trunk? I can definitely do it like this:
> >
> > 1. Grab the PR and convert it into a patch file
> >
> >> In the mail notification from Github there is link to the patch
> >
> >> e.g.
> >
> >> "Patch Links:
> >
> >> https://github.com/apache/tomcat/pull/57.patch
> >> https://github.com/apache/tomcat/pull/57.diff "
> >> http://marc.info/?l=tomcat-dev&m=149630485823205&w=2
>
> I don't see any links like that in the emails from GitHub. For example:
>
> http://marc.info/?l=tomcat-dev&m=149635560007375&w=2

It is in the very first notification for PR creation
here is for #56
http://marc.info/?l=tomcat-dev&m=149601082129073&w=2

"
Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/tomcat/pull/56.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #56
"

>
> I can just add ".patch" to the end of the PR URL as Mark suggested, of
> course.
>
> > 2. Apply the patch to my local svn checkout 3. Commit to svn 4.
> > Reply to PR email saying something like "this closes PR #X"
> >
> >> Typically when I commit, I include to the commit message this
> >> "This closes #X" and the PR is closed automatically.
>
> Is GitHub watching our mailing list for commits?

No ;)

> If I do an "svn
> commit" and merely mention "This closes #57", how does GitHub know
> which GitHub user's "issue #57" it belongs to?

This will happen when the replica of the svn repository goes to GitHub

https://github.com/apache/tomcat/commit/289419307666987970c76cb63132a12df73fffdd


>
> I'm just trying to understand how this all works.
>
> Thanks,
> - -chris
> -BEGIN PGP SIGNATURE-
> Comment: GPGTools - http://gpgtools.org
> Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
>
> iQIcBAEBCAAGBQJZMW2kAAoJEBzwKT+lPKRYAIUP/3uCQBx/1tpw0ZpppuuHrIi2
> Snf9gFfeh4ypuPiGWZGeh7zrwf6CwJ/mZelWnZFC8FLHAEuvk+1BRt/r2qXL4/YG
> k4XimMqQ/+2yWpqHAI/UNYJbxiboMOolusvNPb1oZj6WLA8CNPE0QghkKVxpeqh9
> Tk3+rOHtQ/yXynwMyArFOzLqtXtu9odBwJ/aG7G3HWEH4bNREy/O/ZpzG3koChGK
> ylfwhvlyvolScNJ6FLoKCKC10+PruG+nK8ftiIh74Z68P137qpYCyWJz4VOJOnFb
> SddDgM7YemRsj4avYq6jSYCRL24Dl3yDIvSzjBB+86lgMH/+0VnZSBWLibR/HtfF
> DRSMn29XZAMBoinv6z9cdVeboL4JdNqpS6u30NMMZ/clpg6218UZP5zkkjYg1hPZ
> tKYW3I/TRu6oYs/kqG4JXmwAFv9XD79QQQ2SOsIlDMgSIVlgE6o/MNlOKJ+RNVZJ
> 25uPjQ1PyJv/MHFaH2WopNftP3+RcGmpTQDxepIvcpyDecv95MUzbSpey2IiqPHV
> soErf1OSHDsJ0EU2aXT6GFaSJz3oj0R+RiJ43Jwrg5EKMDSJaeayRCFEUIRX+wH8
> uO04boCH5N+fX68uby+1tRoowEJRgQ8PONR1VSRA4fFoa3K/YI1+a5wcQznMl64V
> t32pSDqu9VtG2sWOLrod
> =Hf0m
> -END PGP SIGNATURE-
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

svn commit: r1797392 - in /tomcat/trunk/java: javax/el/Util.java org/apache/el/util/ReflectionUtil.java

[schultz]

Author: schultz
Date: Fri Jun  2 14:06:00 2017
New Revision: 1797392

URL: http://svn.apache.org/viewvc?rev=1797392&view=rev
Log:
Add equals() and hashCode() methods to Util.MatchResult for completeness.

Modified:
tomcat/trunk/java/javax/el/Util.java
tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java

Modified: tomcat/trunk/java/javax/el/Util.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/Util.java?rev=1797392&r1=1797391&r2=1797392&view=diff
==
--- tomcat/trunk/java/javax/el/Util.java (original)
+++ tomcat/trunk/java/javax/el/Util.java Fri Jun  2 14:06:00 2017
@@ -772,5 +772,29 @@ class Util {
 }
 return cmp;
 }
+
+@Override
+public boolean equals(Object o)
+{
+return o == this
+|| (null != o
+&& this.getClass().equals(o.getClass())
+&& ((MatchResult)o).getExact() == this.getExact()
+&& ((MatchResult)o).getAssignable() == this.getAssignable()
+&& ((MatchResult)o).getCoercible() == this.getCoercible()
+&& ((MatchResult)o).isBridge() == this.isBridge()
+)
+;
+}
+
+@Override
+public int hashCode()
+{
+return (this.isBridge() ? 1 << 24 : 0)
+^ this.getExact() << 16
+^ this.getAssignable() << 8
+^ this.getCoercible()
+;
+}
 }
 }

Modified: tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java?rev=1797392&r1=1797391&r2=1797392&view=diff
==
--- tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java (original)
+++ tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java Fri Jun  2 
14:06:00 2017
@@ -502,6 +502,30 @@ public class ReflectionUtil {
 }
 return cmp;
 }
+
+@Override
+public boolean equals(Object o)
+{
+return o == this
+|| (null != o
+&& this.getClass().equals(o.getClass())
+&& ((MatchResult)o).getExact() == this.getExact()
+&& ((MatchResult)o).getAssignable() == this.getAssignable()
+&& ((MatchResult)o).getCoercible() == this.getCoercible()
+&& ((MatchResult)o).isBridge() == this.isBridge()
+)
+;
+}
+
+@Override
+public int hashCode()
+{
+return (this.isBridge() ? 1 << 24 : 0)
+^ this.getExact() << 16
+^ this.getAssignable() << 8
+^ this.getCoercible()
+;
+}
 }
 
 }



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

[GitHub] tomcat issue #56: Convert Cluster Manager human-readable SendOptions names t...

[ChristopherSchultz]

Github user ChristopherSchultz commented on the issue:

https://github.com/apache/tomcat/pull/56
  
How would you like your name to appear in the changelog? "Patch provided by 
Igal Sapir"?


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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

Re: Things that we can do to increase contributor involvement?

[Violeta Georgieva]

Hi,

2017-05-31 6:07 GMT+03:00 Coty Sutherland :
>
> Hi all,
>
> I've been thinking about things that we could do for Tomcat to help
> bring in new contributors and to be more appealing to new developers.
> Right now we have http://tomcat.apache.org/getinvolved.html which has
> a few bullet points and links to documentation, which is a bit verbose,
> about how to contribute to an Apache project. We also have the wiki
> (https://wiki.apache.org/tomcat/FrontPage), which mentions nothing
> about contributing. Bugzilla is a bit daunting for newcomers (thought
> we did create the "Beginners" tag to help identify some BZs for new
> folks to work on) too. I've been looking around for some ideas on how to
> make it easier for new people to contribute after having some
> conversations with friends about contributing to Tomcat and found some
> interesting examples other projects are using to help bring new people
> in, such as https://wiki.gnome.org/Newcomers (which is my favorite)
> and https://fedoraproject.org/wiki/Join. Obviously Tomcat isn't as
> large of a project as those, but it does have multiple places for
> people to contribute (Documentation, Patches, FAQ, wiki, etc) which
> could use different skill sets. This site
> http://whatcanidoforfedora.org/en would be really cool to implement,
> but at the ASF level I think (Tomcat isn't complex enough to warrant
> that, is it?).
>
> Anyway, the point of this email is really just to say that we should
> take some cues from other projects and try and develop a solid entry
> ramp to help entice new developers :) What does everyone else think?

One thing that might help from my point of view is to provide README.md and
CONTRIBUTING.md for those who are working with GitHub replications of the
repository. It is convenient to have the contribution's instruction
directly in the root of the repository.
e.g.
https://github.com/apache/jmeter/blob/trunk/README.md
https://github.com/apache/flink/blob/master/README.md


What do you think?


Regards,
Violeta
>
>
> Thanks,
> Coty

Re: Things that we can do to increase contributor involvement?

[Coty Sutherland]

On Fri, Jun 2, 2017 at 10:27 AM, Violeta Georgieva  wrote:
> Hi,
>
> 2017-05-31 6:07 GMT+03:00 Coty Sutherland :
>>
>> Hi all,
>>
>> I've been thinking about things that we could do for Tomcat to help
>> bring in new contributors and to be more appealing to new developers.
>> Right now we have http://tomcat.apache.org/getinvolved.html which has
>> a few bullet points and links to documentation, which is a bit verbose,
>> about how to contribute to an Apache project. We also have the wiki
>> (https://wiki.apache.org/tomcat/FrontPage), which mentions nothing
>> about contributing. Bugzilla is a bit daunting for newcomers (thought
>> we did create the "Beginners" tag to help identify some BZs for new
>> folks to work on) too. I've been looking around for some ideas on how to
>> make it easier for new people to contribute after having some
>> conversations with friends about contributing to Tomcat and found some
>> interesting examples other projects are using to help bring new people
>> in, such as https://wiki.gnome.org/Newcomers (which is my favorite)
>> and https://fedoraproject.org/wiki/Join. Obviously Tomcat isn't as
>> large of a project as those, but it does have multiple places for
>> people to contribute (Documentation, Patches, FAQ, wiki, etc) which
>> could use different skill sets. This site
>> http://whatcanidoforfedora.org/en would be really cool to implement,
>> but at the ASF level I think (Tomcat isn't complex enough to warrant
>> that, is it?).
>>
>> Anyway, the point of this email is really just to say that we should
>> take some cues from other projects and try and develop a solid entry
>> ramp to help entice new developers :) What does everyone else think?
>
> One thing that might help from my point of view is to provide README.md and
> CONTRIBUTING.md for those who are working with GitHub replications of the
> repository. It is convenient to have the contribution's instruction
> directly in the root of the repository.
> e.g.
> https://github.com/apache/jmeter/blob/trunk/README.md
> https://github.com/apache/flink/blob/master/README.md
>
>
> What do you think?

Oh yeah. That's a great idea! I was just catching up on the thread and
was trying to think of a way a way to let github users know what
committers are doing with their PRs to get them committed (a README is
obvious). I think that adding some transparency there may help them
understand some issues that could cause latency.

> Regards,
> Violeta
>>
>>
>> Thanks,
>> Coty

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

[GitHub] tomcat issue #56: Convert Cluster Manager human-readable SendOptions names t...

[isapir]

Github user isapir commented on the issue:

https://github.com/apache/tomcat/pull/56
  
That's fine.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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

Re: svn commit: r1797392 - in /tomcat/trunk/java: javax/el/Util.java org/apache/el/util/ReflectionUtil.java

[Mark Thomas]

On 2 June 2017 15:06:00 BST, schu...@apache.org wrote:
>Author: schultz
>Date: Fri Jun  2 14:06:00 2017
>New Revision: 1797392
>
>URL: http://svn.apache.org/viewvc?rev=1797392&view=rev
>Log:
>Add equals() and hashCode() methods to Util.MatchResult for
>completeness.
>
>Modified:
>tomcat/trunk/java/javax/el/Util.java
>tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java

This is a spec class you are modifying. Those sort of changes make me nervous. 
Can you expand on why you think this code is necessary?

Does it change behaviour? If yes, what is the spec justification for doing so? 
If no, why bother?

Mark


>
>Modified: tomcat/trunk/java/javax/el/Util.java
>URL:
>http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/Util.java?rev=1797392&r1=1797391&r2=1797392&view=diff
>==
>--- tomcat/trunk/java/javax/el/Util.java (original)
>+++ tomcat/trunk/java/javax/el/Util.java Fri Jun  2 14:06:00 2017
>@@ -772,5 +772,29 @@ class Util {
> }
> return cmp;
> }
>+
>+@Override
>+public boolean equals(Object o)
>+{
>+return o == this
>+|| (null != o
>+&& this.getClass().equals(o.getClass())
>+&& ((MatchResult)o).getExact() == this.getExact()
>+&& ((MatchResult)o).getAssignable() ==
>this.getAssignable()
>+&& ((MatchResult)o).getCoercible() ==
>this.getCoercible()
>+&& ((MatchResult)o).isBridge() == this.isBridge()
>+)
>+;
>+}
>+
>+@Override
>+public int hashCode()
>+{
>+return (this.isBridge() ? 1 << 24 : 0)
>+^ this.getExact() << 16
>+^ this.getAssignable() << 8
>+^ this.getCoercible()
>+;
>+}
> }
> }
>
>Modified: tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java
>URL:
>http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java?rev=1797392&r1=1797391&r2=1797392&view=diff
>==
>--- tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java (original)
>+++ tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java Fri Jun  2
>14:06:00 2017
>@@ -502,6 +502,30 @@ public class ReflectionUtil {
> }
> return cmp;
> }
>+
>+@Override
>+public boolean equals(Object o)
>+{
>+return o == this
>+|| (null != o
>+&& this.getClass().equals(o.getClass())
>+&& ((MatchResult)o).getExact() == this.getExact()
>+&& ((MatchResult)o).getAssignable() ==
>this.getAssignable()
>+&& ((MatchResult)o).getCoercible() ==
>this.getCoercible()
>+&& ((MatchResult)o).isBridge() == this.isBridge()
>+)
>+;
>+}
>+
>+@Override
>+public int hashCode()
>+{
>+return (this.isBridge() ? 1 << 24 : 0)
>+^ this.getExact() << 16
>+^ this.getAssignable() << 8
>+^ this.getCoercible()
>+;
>+}
> }
> 
> }
>
>
>
>-
>To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>For additional commands, e-mail: dev-h...@tomcat.apache.org


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

Re: Things that we can do to increase contributor involvement?

[Mark Thomas]

On 2 June 2017 15:27:08 BST, Violeta Georgieva  wrote:
>Hi,
>
>2017-05-31 6:07 GMT+03:00 Coty Sutherland :
>>
>> Hi all,
>>
>> I've been thinking about things that we could do for Tomcat to help
>> bring in new contributors and to be more appealing to new developers.
>> Right now we have http://tomcat.apache.org/getinvolved.html which has
>> a few bullet points and links to documentation, which is a bit
>verbose,
>> about how to contribute to an Apache project. We also have the wiki
>> (https://wiki.apache.org/tomcat/FrontPage), which mentions nothing
>> about contributing. Bugzilla is a bit daunting for newcomers (thought
>> we did create the "Beginners" tag to help identify some BZs for new
>> folks to work on) too. I've been looking around for some ideas on how
>to
>> make it easier for new people to contribute after having some
>> conversations with friends about contributing to Tomcat and found
>some
>> interesting examples other projects are using to help bring new
>people
>> in, such as https://wiki.gnome.org/Newcomers (which is my favorite)
>> and https://fedoraproject.org/wiki/Join. Obviously Tomcat isn't as
>> large of a project as those, but it does have multiple places for
>> people to contribute (Documentation, Patches, FAQ, wiki, etc) which
>> could use different skill sets. This site
>> http://whatcanidoforfedora.org/en would be really cool to implement,
>> but at the ASF level I think (Tomcat isn't complex enough to warrant
>> that, is it?).
>>
>> Anyway, the point of this email is really just to say that we should
>> take some cues from other projects and try and develop a solid entry
>> ramp to help entice new developers :) What does everyone else think?
>
>One thing that might help from my point of view is to provide README.md
>and
>CONTRIBUTING.md for those who are working with GitHub replications of
>the
>repository. It is convenient to have the contribution's instruction
>directly in the root of the repository.
>e.g.
>https://github.com/apache/jmeter/blob/trunk/README.md
>https://github.com/apache/flink/blob/master/README.md
>
>
>What do you think?

+1

Mark

>
>
>Regards,
>Violeta
>>
>>
>> Thanks,
>> Coty


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

[Bug 61149] Tomcat 8.5.14 - Crash in [tcnative-1.dll+0x1091a0]

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=61149

Thomas  changed:

   What|Removed |Added

 CC||t.reisin...@sisworld.com
 OS||All

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 61149] New: Tomcat 8.5.14 - Crash in [tcnative-1.dll+0x1091a0]

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=61149

Bug ID: 61149
   Summary: Tomcat 8.5.14 - Crash in [tcnative-1.dll+0x1091a0]
   Product: Tomcat Native
   Version: 1.2.10
  Hardware: PC
Status: NEW
  Severity: critical
  Priority: P2
 Component: Library
  Assignee: dev@tomcat.apache.org
  Reporter: t.reisin...@sisworld.com
  Target Milestone: ---

Our Tomcat crashes frequently. Tcnative 1.2.12 does not solve this Problem.

#
# A fatal error has been detected by the Java Runtime Environment:
#
#  EXCEPTION_ACCESS_VIOLATION (0xc005) at pc=0x0001801091a0, pid=2176,
tid=0x0870
#
# JRE version: Java(TM) SE Runtime Environment (8.0_131-b11) (build
1.8.0_131-b11)
# Java VM: Java HotSpot(TM) 64-Bit Server VM (25.131-b11 mixed mode
windows-amd64 compressed oops)
# Problematic frame:
# C  [tcnative-1.dll+0x1091a0]
#
# Core dump written. Default location: C:\Program Files\Apache Software
Foundation\Tomcat 8.5\hs_err_pid2176.mdmp
#
# If you would like to submit a bug report, please visit:
#   http://bugreport.java.com/bugreport/crash.jsp
# The crash happened outside the Java Virtual Machine in native code.
# See problematic frame for where to report the bug.
#

---  T H R E A D  ---

Current thread (0x1530f800):  JavaThread
"https-openssl-apr-7443-exec-19" daemon [_thread_in_native, id=2160,
stack(0x2600,0x2610)]

siginfo: ExceptionCode=0xc005, reading address 0x0130

Registers:
RAX=0xdaf5f55b52ae, RBX=0x, RCX=0x,
RDX=0x260fed90
RSP=0x260febb8, RBP=0x2396cab8, RSI=0x0002,
RDI=0x1530f9f8
R8 =0x2396c840, R9 =0x0002, R10=0x00018000ea90,
R11=0xed1c6178
R12=0x, R13=0x260fee90, R14=0x260fed90,
R15=0x1530f800
RIP=0x0001801091a0, EFLAGS=0x00010246

Top of Stack: (sp=0x260febb8)
0x260febb8:   00018000eb6a 1530f800
0x260febc8:   eb682688 13322cc8
0x260febd8:   1530f800 0001002d3300
0x260febe8:   1530f800 13322cc8
0x260febf8:   53d613a7 194cef50
0x260fec08:   260fef10 ed1b8220
0x260fec18:   039abbcc 1530f800
0x260fec28:   0001800220b5 13322cc8
0x260fec38:   1530f800 
0x260fec48:   138c ed1b8220
0x260fec58:   010e621e 1530f800
0x260fec68:   260fef10 138c
0x260fec78:   eb682608 027f
0x260fec88:    
0x260fec98:   1fa0 
0x260feca8:     

Instructions: (pc=0x0001801091a0)
0x000180109180:   48 8b 81 00 01 00 00 48 85 c0 74 08 48 8b 00 48
0x000180109190:   8b 40 08 c3 33 c0 c3 cc cc cc cc cc cc cc cc cc
0x0001801091a0:   48 8b 81 30 01 00 00 48 85 c0 74 0c 48 8b 80 d0
0x0001801091b0:   00 00 00 48 85 c0 75 02 33 c0 f3 c3 cc cc cc cc 


Register to memory mapping:

RAX=0xdaf5f55b52ae is an unknown value
RBX=0x is an unknown value
RCX=0x is an unknown value
RDX=0x260fed90 is pointing into the stack for thread:
0x1530f800
RSP=0x260febb8 is pointing into the stack for thread:
0x1530f800
RBP=0x2396cab8 is an unknown value
RSI=0x0002 is an unknown value
RDI=0x1530f9f8 is an unknown value
R8 =0x2396c840 is an unknown value
R9 =0x0002 is an unknown value
R10=0x00018000ea90 is an unknown value
R11=0xed1c6178 is an oop
org.apache.tomcat.util.net.AprSSLSupport 
 - klass: 'org/apache/tomcat/util/net/AprSSLSupport'
R12=0x is an unknown value
R13=0x260fee90 is pointing into the stack for thread:
0x1530f800
R14=0x260fed90 is pointing into the stack for thread:
0x1530f800
R15=0x1530f800 is a thread


Stack: [0x2600,0x2610],  sp=0x260febb8,  free
space=1018k
Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
C  [tcnative-1.dll+0x1091a0]

Java frames: (J=compiled Java code, j=interpreted, Vv=VM code)
J 15271  org.apache.tomcat.jni.SSLSocket.getInfoS(JI)Ljava/lang/String; (0
bytes) @ 0x012e7444 [0x012e7400+0x44]
J 17687 C1
org.apache.tomcat.util.net.AprSSLSupport.getCipherSuite()Ljava/lang/String; (38
bytes) @ 0x040ffd04 [0x040ff9e0+0x324]
J 17774 C2
org.apache.coyote.AbstractProcessor.action(Lorg/apache/coyote/ActionCode;Ljava/lang/Object;)V
(941 bytes) @ 0x0416bfcc [0x0416b9c0+0x60c]
J 16185 C1
org.apache.coyote.Request.action(Lorg/apache/coyote/ActionCode;Lja

[Bug 60461] SIGSEGV in SSLSocket.getInfos

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=60461

Remy Maucherat  changed:

   What|Removed |Added

 CC||t.reisin...@sisworld.com

--- Comment #22 from Remy Maucherat  ---
*** Bug 61149 has been marked as a duplicate of this bug. ***

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 61149] Tomcat 8.5.14 - Crash in [tcnative-1.dll+0x1091a0]

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=61149

Remy Maucherat  changed:

   What|Removed |Added

 Resolution|--- |DUPLICATE
 Status|NEW |RESOLVED

--- Comment #1 from Remy Maucherat  ---


*** This bug has been marked as a duplicate of bug 60461 ***

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Manager applications and the Security Manager

[Coty Sutherland]

Hi,

I'm sure this has been brought up before, but I can't find it so I
figured I'd ask...

A vanilla installation of tomcat fails to start the admin webapps with
the Security Manager enabled. This is because the manager and
host-manager webapps ship with a context.xml. The behavior isn't
documented anywhere that I see, so I'm curious if it's intentional or
has been flying under the radar. Are there reasons why we would not
trust an application that we ship when running under the Security
Manager? Is there a reason we can't move the context.xml for each app
into the appropriate conf/[Engine]/[Host] directory to fix this?

If you guys think this is a bug I can file a BZ and fix it :D Or, mark
it as "Beginner" since it's trivial.



Thanks,
Coty

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

Re: Manager applications and the Security Manager

[Igal @ Lucee.org]

Coty,

On 6/2/2017 11:15 AM, Coty Sutherland wrote:

If you guys think this is a bug I can file a BZ and fix it :D Or, mark
it as "Beginner" since it's trivial.


If it's trivial then please mark it as a Beginner if you open a ticket.  
It will give new contributors like myself a chance to get better 
acquainted with the Tomcat code base, and allow you to take care of 
things that require more experience.


Best,

Igal Sapir
Lucee Core Developer
Lucee.org 

Re: Manager applications and the Security Manager

[Coty Sutherland]

On Fri, Jun 2, 2017 at 2:29 PM, Igal @ Lucee.org  wrote:
> Coty,
>
> On 6/2/2017 11:15 AM, Coty Sutherland wrote:
>>
>> If you guys think this is a bug I can file a BZ and fix it :D Or, mark
>> it as "Beginner" since it's trivial.
>
>
> If it's trivial then please mark it as a Beginner if you open a ticket.  It
> will give new contributors like myself a chance to get better acquainted
> with the Tomcat code base, and allow you to take care of things that require
> more experience.

Will do, assuming everyone thinks its a bug.

> Best,
>
> Igal Sapir
> Lucee Core Developer
> Lucee.org 
>

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

[Bug 61150] New: One of the session attributes on the [host-]manager application is disallowed by the Security Manager

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=61150

Bug ID: 61150
   Summary: One of the session attributes on the [host-]manager
application is disallowed by the Security Manager
   Product: Tomcat 8
   Version: 8.0.x-trunk
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: csuth...@redhat.com
  Target Milestone: 

To reproduce:

1) Configure tomcat user for testing (conf/tomcat-users.xml):



2) Start Tomcat

bin/catalina.sh start

3) Create a session

$ curl -is http://tomcat:tomcat@localhost:8080/manager/html | egrep
'(HTTP|JSESSIONID)'
HTTP/1.1 200 OK
Set-Cookie: JSESSIONID=DAF81E606AED325CB2E5C2773DB866CE; Path=/manager;
HttpOnly

4) Stop Tomcat so that the session are serialized

bin/catalina.sh stop

5) Start Tomcat with Security Manager to deserialize the sessions

bin/catalina.sh start -security

6) Check log for exception after startup:

02-Jun-2017 14:16:46.114 SEVERE [localhost-startStop-1]
org.apache.catalina.session.StandardManager.startInternal Exception loading
sessions from persistent storage
 java.io.InvalidClassException: The class
[org.apache.catalina.filters.CsrfPreventionFilter$LruCache] did not match the
regular expression [java\.lang\.(?:Boolean|Integer|Long|Number|String)] for
classes allowed to be deserialized
at
org.apache.catalina.util.CustomObjectInputStream.resolveClass(CustomObjectInputStream.java:146)
at java.io.ObjectInputStream.readNonProxyDesc(ObjectInputStream.java:1612)
at java.io.ObjectInputStream.readClassDesc(ObjectInputStream.java:1517)
at
java.io.ObjectInputStream.readOrdinaryObject(ObjectInputStream.java:1771)
at java.io.ObjectInputStream.readObject0(ObjectInputStream.java:1350)
at java.io.ObjectInputStream.readObject(ObjectInputStream.java:370)
at
org.apache.catalina.session.StandardSession.doReadObject(StandardSession.java:1624)
at
org.apache.catalina.session.StandardSession.readObjectData(StandardSession.java:1090)
at
org.apache.catalina.session.StandardManager.doLoad(StandardManager.java:218)
at
org.apache.catalina.session.StandardManager$PrivilegedDoLoad.run(StandardManager.java:74)
at
org.apache.catalina.session.StandardManager$PrivilegedDoLoad.run(StandardManager.java:65)
at java.security.AccessController.doPrivileged(Native Method)
at
org.apache.catalina.session.StandardManager.load(StandardManager.java:149)
at
org.apache.catalina.session.StandardManager.startInternal(StandardManager.java:356)
at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:145)
at
org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5331)
at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:145)
at
org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:753)
at
org.apache.catalina.core.ContainerBase.access$000(ContainerBase.java:131)
at
org.apache.catalina.core.ContainerBase$PrivilegedAddChild.run(ContainerBase.java:153)
at
org.apache.catalina.core.ContainerBase$PrivilegedAddChild.run(ContainerBase.java:143)
at java.security.AccessController.doPrivileged(Native Method)
at org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:727)
at org.apache.catalina.core.StandardHost.addChild(StandardHost.java:717)
at
org.apache.catalina.startup.HostConfig.deployDescriptor(HostConfig.java:587)
at
org.apache.catalina.startup.HostConfig$DeployDescriptor.run(HostConfig.java:1798)
at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471)
at java.util.concurrent.FutureTask.run(FutureTask.java:262)
at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:745)

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Manager applications and the Security Manager

[Christopher Schultz]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Coty,

On 6/2/17 2:15 PM, Coty Sutherland wrote:
> Hi,
> 
> I'm sure this has been brought up before, but I can't find it so I 
> figured I'd ask...
> 
> A vanilla installation of tomcat fails to start the admin webapps
> with the Security Manager enabled. This is because the manager and 
> host-manager webapps ship with a context.xml.

Why is that a problem?

(I'm honestly asking... I've never looked much into the details of how
Tomcat + SM works.)

> The behavior isn't documented anywhere that I see, so I'm curious
> if it's intentional or has been flying under the radar. Are there 
> reasons why we would not trust an application that we ship when 
> running under the Security Manager? Is there a reason we can't
> move the context.xml for each app into the appropriate 
> conf/[Engine]/[Host] directory to fix this?

We probably can, but that makes the app(s) a little less
trivially-relocatable.

> If you guys think this is a bug I can file a BZ and fix it :D Or,
> mark it as "Beginner" since it's trivial.

- -chris
-BEGIN PGP SIGNATURE-
Comment: GPGTools - http://gpgtools.org
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBCAAGBQJZMcq6AAoJEBzwKT+lPKRYPOcQAMGnmT6iPKblBtdISy/YbOzX
A+VKvxGsP2H1RJAI8n8uuUsSQP91wYio5ZPlyEe0kteimQrmR/Q9Avgo5omxQB5o
Xi9CbqZq5Nxh/53zwwp5CNHE4CUMGqpQopH1617+M+1OBH8pDGRP+9GstcDAAIU5
a+2FeDge0fufmawfEW2FFpQ59FB3u0FRckkPXTNPvZSU/HmT77U3D2opidpTELtU
mkh4g7U8ouEQ2oam6cMEts86Oa7pkon45t3enfO2yUsskFl8vk/jQ3TGjby0VUVf
lSVDCZFMcWGs1bBdQgqCpHeM9oTyTtBV3xbHIUKQMYgCEKepZ9baYO3+Se0B+++/
ENX83PnvqsLpqfI+rYsLvkWSdVfOuV/NNkdbt+U2GbqkRrOkj+ACbtIj6RXYn3ST
E70bTdHJLci2LJJhFQ0S7Ns8nIaDBjzzPS1xJmwflwtev+EgZPdPs+eHpvY8c00X
xFwiOjm0P4YTJMVvQcAq9xbmpzO6RnK+1iKXhUXGWHjHxX1QhAymNLqomz2u3oF4
UO8usmtYtpnxegeqy2Jax86sFfxv0YnKd+FhIW/xVUxF1wsN0qf50JgBIAzmMzO8
Jfu3rJiqxTKEVXCjNkIx2C+tFO2grlhm1qeBR2I7xz5QkAGQeHfWjJs4QUrfOyfl
Wa7d1YBTLDTIWrmB6Of6
=4rCb
-END PGP SIGNATURE-

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

Re: Manager applications and the Security Manager

[Mark Thomas]

On 02/06/2017 21:29, Christopher Schultz wrote:
> Coty,
> 
> On 6/2/17 2:15 PM, Coty Sutherland wrote:
>> Hi,
> 
>> I'm sure this has been brought up before, but I can't find it so I 
>> figured I'd ask...
> 
>> A vanilla installation of tomcat fails to start the admin webapps
>> with the Security Manager enabled. This is because the manager and 
>> host-manager webapps ship with a context.xml.
> 
> Why is that a problem?
> 
> (I'm honestly asking... I've never looked much into the details of how
> Tomcat + SM works.)

If a SecurityManager is enabled, any META-INF/context.xml is ignored
since that file can be used by bypass some of the constraints imposed by
the SecurityManager.


>> The behavior isn't documented anywhere that I see, so I'm curious
>> if it's intentional or has been flying under the radar.

It is known and it hasn't been changed so I guess that makes it intentional.

>> Are there 
>> reasons why we would not trust an application that we ship when 
>> running under the Security Manager?

No. But the 'don't use META-INF/context.xml' rule is a general one, not
a per application one.

>> Is there a reason we can't
>> move the context.xml for each app into the appropriate 
>> conf/[Engine]/[Host] directory to fix this?
> 
> We probably can, but that makes the app(s) a little less
> trivially-relocatable.

It would be better if they were self-contained. It is easier for folks
to remove them.

A better solution would be to switch to the corresponding filter.

>> If you guys think this is a bug I can file a BZ and fix it :D Or,
>> mark it as "Beginner" since it's trivial.

Enhancement request to switch to the filter works for me. The fix is
still fairly trivial in with that solution.

Mark

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

Re: asyncError() is not valid while in Async state DISPATCHING

[Mark Thomas]

On 02/06/2017 10:46, Violeta Georgieva wrote:
> 2017-06-02 12:37 GMT+03:00 Mark Thomas :
>>
>> On 02/06/2017 10:23, Violeta Georgieva wrote:
>>> Hi Mark,
>>>
>>> 2017-05-22 14:28 GMT+03:00 Mark Thomas :
>>
>> 
>>
 I'm leaning towards thinking this is an application bug.

 If the application has two non-container threads, A and B, then, as per
 section 2.3.3.4 of the Servlet spec, the application is responsible for
 accessing the request from those threads in a thread-safe manner.
>>>
>>> Yep I agree with the above, but in this scenario we have one
> non-container
>>> thread A
>>> and the other thread B is actually a container thread that tries to
> send a
>>> notification for an error.
>>>
>>> org.apache.catalina.connector.CoyoteAdapter.asyncDispatch Exception
> while
>>> processing an asynchronous request
>>>  java.lang.IllegalStateException: Calling [asyncError()] is not valid
> for a
>>> request with Async state [DISPATCHING]
>>> at org.apache.coyote.AsyncStateMachine.asyncError(
>>> AsyncStateMachine.java:398)
>>> at
> org.apache.coyote.AbstractProcessor.action(AbstractProcessor.java:393)
>>> at org.apache.coyote.Request.action(Request.java:390)
>>> at org.apache.catalina.core.AsyncContextImpl.setErrorState(
>>> AsyncContextImpl.java:385)
>>> at org.apache.catalina.connector.CoyoteAdapter.asyncDispatch(
>>> CoyoteAdapter.java:175)
>>> at
> org.apache.coyote.AbstractProcessor.dispatch(AbstractProcessor.java:225)
>>> at org.apache.coyote.AbstractProcessorLight.process(
>>> AbstractProcessorLight.java:53)
>>>
>>> What do you think?
>>
>> I think I still need more clarity on what is going on. Going back to
>> your original e-mail, the problems start when:
>>
>> - At some point thread A makes dispatch() -> Async state is changed
>>   to DISPATCHING
>> - At the same time a socket error occurs
> 
> Client closes the connection while the application is writing the response.

Sorry - still trying to clarify in my mind what is going on here. Is
this right?

Application does async write (that does not complete). Container will
complete this later.

Application calls dispatch.

At the same time the application calls dispatch, the container tries to
complete the async write and that fails because the client disconnected?

Error handling then fails because of the dispatch?

Mark


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

[Bug 60461] SIGSEGV in SSLSocket.getInfos

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=60461

--- Comment #23 from Christopher Schultz  ---
Some initial investigation based upon the initial bug report + crash dump.

1. The call from Java is AprSSLSupport.getCipherSuite
2. AprSSLSupport.getCipherSuite calls SSLSocket.getInfoS [native]
... with arg values [socketRef, a pointer to a tcn_socket_t, Java-long]
and [SSL.SSL_INFO_CIPHER, value=0x02 Java-int]
3. The native call, for SSL_INFO_CIPHER should execute the following code
(compiled without DEBUG):

TCN_IMPLEMENT_CALL(jstring, SSLSocket, getInfoS)(JNIEnv *e, jobject o,
 jlong sock, jint what)
{
tcn_socket_t   *a = J2P(sock, tcn_socket_t *);
tcn_ssl_conn_t *s;
jstring value = NULL;
apr_status_t rv = APR_SUCCESS;

(o)=(o); // Don't complain that we aren't referencing a function arg

s = (tcn_ssl_conn_t *)(a->opaque);

if(what == SSL_INFO_CIPHER) // this is actually a switch case
value = tcn_new_string(e, SSL_get_cipher_name(s->ssl));

if (rv != APR_SUCCESS) // Doesn't happen
tcn_ThrowAPRException(e, rv);

return value;
}

There really aren't many opportunities for a crash, here:

1. Without DEBUG enabled, the value of "sock" isn't tested to be non-NULL after
the (o)=(o) line, so theoretically the local 'a' could be NULL
2. The value of 's' is never checked against NULL, and could segfault when
dereferencing s->ssl

The dump says the fault is in *this* function, and e.g. not a function called
by it.
SSL_get_cipher_name returns NULL if there isn't any SSL session.[1]
The tcn_new_string function returns NULL if the argument is NULL, so it's safe
to call without checking the return value of SSL_get_cipher_name.

In the Windows dump, the referenced address is spelled-out: "reading address
0x0130". That's not "NULL".
In the Linux dump, the referenced address is not directly shown.

The Linux dump tells us where in the function we are:
Java_org_apache_tomcat_jni_SSLSocket_getInfoS+0x19

That's 25 bytes into the function, which is "not very far". I'm not entirely
sure if the instructions for setting-up the stack for local variables are
included in that 0x19, but if they are, then it's possible that we are talking
about the very beginning of the function, here.

Here's the gdb disassembly of the beginning of the function:

(gdb) disassemble Java_org_apache_tomcat_jni_SSLSocket_getInfoS
Dump of assembler code for function
Java_org_apache_tomcat_jni_SSLSocket_getInfoS:
   0x000200f0 <+0>: movQWORD PTR [rsp-0x30],rbx
   0x000200f5 <+5>: movQWORD PTR [rsp-0x20],r12
   0x000200fa <+10>:movebx,ecx
   0x000200fc <+12>:movQWORD PTR [rsp-0x18],r13
   0x00020101 <+17>:movQWORD PTR [rsp-0x28],rbp
   0x00020106 <+22>:movr12,rdi
   0x00020109 <+25>:movQWORD PTR [rsp-0x10],r14< crash
here?!
   0x0002010e <+30>:movQWORD PTR [rsp-0x8],r15

At this point, no accesses have taken place other than things on the stack.
Basically, we haven't actually done anything, yet.

If these really are two reports of the same bug, then the Windows report tells
us we are trying to read from a bad location. Everything up through
getInfoS+0x19 reads from registers, which should never cause a SIGSEGV.

:(

I'm trying to make some sense of the stacks in these dumps but ... they aren't
making any sense to me... things like stack frames that are thousands of bytes
large, missing data (0x2 has to be in there somewhere!) but I'll have to save
that for another day.

[1] https://www.openssl.org/docs/man1.1.0/ssl/SSL_get_cipher_name.html

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 60461] SIGSEGV in SSLSocket.getInfos

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=60461

--- Comment #24 from Christopher Schultz  ---
Are any of the reporters of this bug able to compile their own custom tcnative
library if I provide a small instrumentation patch?

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Manager applications and the Security Manager

[Coty Sutherland]

On Fri, Jun 2, 2017 at 4:41 PM, Mark Thomas  wrote:
> On 02/06/2017 21:29, Christopher Schultz wrote:
>> Coty,
>>
>> On 6/2/17 2:15 PM, Coty Sutherland wrote:
>>> Hi,
>>
>>> I'm sure this has been brought up before, but I can't find it so I
>>> figured I'd ask...
>>
>>> A vanilla installation of tomcat fails to start the admin webapps
>>> with the Security Manager enabled. This is because the manager and
>>> host-manager webapps ship with a context.xml.
>>
>> Why is that a problem?
>>
>> (I'm honestly asking... I've never looked much into the details of how
>> Tomcat + SM works.)
>
> If a SecurityManager is enabled, any META-INF/context.xml is ignored
> since that file can be used by bypass some of the constraints imposed by
> the SecurityManager.
>
>
>>> The behavior isn't documented anywhere that I see, so I'm curious
>>> if it's intentional or has been flying under the radar.
>
> It is known and it hasn't been changed so I guess that makes it intentional.
>
>>> Are there
>>> reasons why we would not trust an application that we ship when
>>> running under the Security Manager?
>
> No. But the 'don't use META-INF/context.xml' rule is a general one, not
> a per application one.
>
>>> Is there a reason we can't
>>> move the context.xml for each app into the appropriate
>>> conf/[Engine]/[Host] directory to fix this?
>>
>> We probably can, but that makes the app(s) a little less
>> trivially-relocatable.
>
> It would be better if they were self-contained. It is easier for folks
> to remove them.

I was going to suggest copying them into conf or using a symlink, but
copying them breaks tomcat when they are removed from webapps and a
symlink causes an NPE in o.a.c.startup.HostConfig.deployDescriptor().
I guess we should leave it up to the user to decide and maybe document
it somewhere a bit more clearly?

> A better solution would be to switch to the corresponding filter.
>
>>> If you guys think this is a bug I can file a BZ and fix it :D Or,
>>> mark it as "Beginner" since it's trivial.
>
> Enhancement request to switch to the filter works for me. The fix is
> still fairly trivial in with that solution.

Filter? Did I miss something? This email and the BZ that I filed about
the filter attribute are two separate things.

> Mark
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

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

Re: Documentation Contribution: Tomcat Container Managed Security

[Adrian Bartlett]

Thanks for your feedback Mark. Its been a while, but I made some updates to
address your comments. And the updated dashboards are here:
* https://design.codelytics.io/tomcat/security-login-form
* https://design.codelytics.io/tomcat/security-login

If I was to work with one of Tomcat's expert/senior contributors, we could
document the entire Tomcat architecture. An example of a dashboard more at
the architectural level is here:
https://design.codelytics.io/tomcat/jdbc-query. Notice in the sequence
diagram how the objects have been grouped into packages, which enables a
higher level of abstraction at the architectural level.

This documentation would give new contributors the ability:
* To get up to speed quickly on the inner workings of Tomcat, and
contributing sooner
* To better align their work with Tomcat's existing architecture

Users could also read the documentation to gain a greater understanding of
Tomcat, and improved ability to self serve.

We could tie the documentation generation into your CI/CD system, so the
documentation was always up to date and hosted on your own servers.

If you think this can add value, send through an email of someone
interested in helping. And we can go about capturing Tomcat's important
concepts.

I have been using Tomcat since 1999 and would be tickled pink if I could
help out in this way.



On Fri, Mar 10, 2017 at 10:18 PM, Mark Thomas  wrote:

> On 10/03/17 11:19, Adrian Bartlett wrote:
> > Hi All,
> >
> > I documented the:  */jsp/security/protected/index.html*,  example that
> > comes bundled with Tomcat. It is documented using Sequence Diagrams and
> > Class Diagrams in the following two dashboards:
> > https://design.codelytics.io/?dashboardId=tomcat.cms.login_form
> > https://design.codelytics.io/?dashboardId=tomcat.cms.login
> >
> > If you feel that this type of documentation is useful for Tomcat users
> and
> > developers. I can document other aspects of Tomcat, like Realms,
> Connection
> > Pooling, Valves etc.
>
> Anything that helps users understand how things like this work is good.
>
> I found the UI a little clunky and my personal preference is to see more
> information on the screen at once.
>
> You need to include part 2 of the security constraint in the excerpt
> from web.xml in the intro.
>
> I suggest asking for feedback on the users list to see which areas are
> of greatest interest.
>
> Kind regards,
>
> Mark
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>