Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-04 04:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-9.3.x'

Browse Source
This commit is contained in:
Greg Wilkins 2016-04-14 16:32:51 +10:00
commit 6163ee7293
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java
View File

@ -452,8 +452,6 @@ public class AnnotationConfiguration extends AbstractConfiguration
if (initializers != null && initializers.size()>0) if (initializers != null && initializers.size()>0)
{ {
Map<String, Set<String>> map = ( Map<String, Set<String>>) context.getAttribute(AnnotationConfiguration.CLASS_INHERITANCE_MAP); Map<String, Set<String>> map = ( Map<String, Set<String>>) context.getAttribute(AnnotationConfiguration.CLASS_INHERITANCE_MAP);
if (map == null)
LOG.warn ("ServletContainerInitializers: detected. Class hierarchy: empty");
for (ContainerInitializer i : initializers) for (ContainerInitializer i : initializers)
i.resolveClasses(context,map); i.resolveClasses(context,map);
} }

1
jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/TextPartialMessage.java
View File

@ -50,6 +50,7 @@ public class TextPartialMessage implements MessageAppender
public void appendFrame(ByteBuffer payload, boolean isLast) throws IOException public void appendFrame(ByteBuffer payload, boolean isLast) throws IOException
{ {
String partialText = utf8Partial.toPartialString(payload); String partialText = utf8Partial.toPartialString(payload);
// No decoders for Partial messages per JSR-356 (PFD1 spec) // No decoders for Partial messages per JSR-356 (PFD1 spec)
partialHandler.onMessage(partialText,isLast); partialHandler.onMessage(partialText,isLast);
} }