Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged branch 'jetty-9.4.x' into 'master'.

This commit is contained in:
Simone Bordet 2017-07-26 11:09:28 +02:00
parent a0b97619b6 2e13208758
commit 38f41e9676
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
View File

@ -978,11 +978,18 @@ public class AnnotationParser
return false;
//skip anything that is not a class file
if (!name.toLowerCase(Locale.ENGLISH).endsWith(".class"))
String lc = name.toLowerCase(Locale.ENGLISH);
if (!lc.endsWith(".class"))
{
if (LOG.isDebugEnabled()) LOG.debug("Not a class: {}",name);
return false;
}
if (lc.equals("module-info.class"))
{
if (LOG.isDebugEnabled()) LOG.debug("Skipping module-info.class");
return false;
}
//skip any classfiles that are not a valid java identifier
int c0 = 0;
@ -990,7 +997,7 @@ public class AnnotationParser
c0 = (ldir > -1 ? ldir+1 : c0);
if (!Character.isJavaIdentifierStart(name.charAt(c0)))
{
if (LOG.isDebugEnabled()) LOG.debug("Not a java identifier: {}"+name);
if (LOG.isDebugEnabled()) LOG.debug("Not a java identifier: {}",name);
return false;
}

2
jetty-maven-plugin/pom.xml
View File

@ -194,7 +194,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>3.0.1-SNAPSHOT</version>
<version>3.0.1</version>
<executions>
<execution>
<id>integration-test</id>

11
jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
View File

@ -793,9 +793,16 @@ public class HttpInput extends ServletInputStream implements Runnable
synchronized (_inputQ)
{
if (_state instanceof ErrorState)
LOG.warn(x);
{
Throwable failure = new Throwable(_state.getError());
failure.addSuppressed(new Throwable(x));
LOG.warn(failure);
}
else
_state = new ErrorState(x);
{
// Retain the current stack trace by wrapping the failure.
_state = new ErrorState(new Throwable(x));
}
if (_listener == null)
_inputQ.notify();