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

Fixing merge problems with issue-207 -> master

This commit is contained in:
Joakim Erdfelt 2017-06-05 10:37:41 -07:00
parent b8e10ce9ef
commit 8f57fe9da9
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
View File

@ -643,7 +643,7 @@ public class WebSocketServerFactory extends ContainerLifeCycle implements WebSoc
{ {
final StringBuilder sb = new StringBuilder(this.getClass().getSimpleName()); final StringBuilder sb = new StringBuilder(this.getClass().getSimpleName());
sb.append('@').append(Integer.toHexString(hashCode())); sb.append('@').append(Integer.toHexString(hashCode()));
sb.append("[defaultPolicy=").append(defaultPolicy); sb.append("[defaultPolicy=").append(containerPolicy);
sb.append(",creator=").append(creator.getClass().getName()); sb.append(",creator=").append(creator.getClass().getName());
sb.append("]"); sb.append("]");
return sb.toString(); return sb.toString();

3
jetty-websocket/websocket-tests/pom.xml
View File

@ -3,7 +3,7 @@
<parent> <parent>
<groupId>org.eclipse.jetty.websocket</groupId> <groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-parent</artifactId> <artifactId>websocket-parent</artifactId>
<version>9.4.5-SNAPSHOT</version> <version>10.0.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -55,7 +55,6 @@
<artifactId>jetty-http</artifactId> <artifactId>jetty-http</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<classifier>tests</classifier> <classifier>tests</classifier>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.toolchain</groupId> <groupId>org.eclipse.jetty.toolchain</groupId>