From 8f57fe9da9908cdf0d125007f1b441c59a81f8d0 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 5 Jun 2017 10:37:41 -0700
Subject: [PATCH] Fixing merge problems with issue-207 -> master

---
 .../eclipse/jetty/websocket/server/WebSocketServerFactory.java | 2 +-
 jetty-websocket/websocket-tests/pom.xml                        | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
index f898ff118d4..2a8606c8cb6 100644
--- a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
+++ b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
@@ -643,7 +643,7 @@ public class WebSocketServerFactory extends ContainerLifeCycle implements WebSoc
     {
         final StringBuilder sb = new StringBuilder(this.getClass().getSimpleName());
         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("]");
         return sb.toString();
diff --git a/jetty-websocket/websocket-tests/pom.xml b/jetty-websocket/websocket-tests/pom.xml
index 3acfa0e5574..ea8a7181e87 100644
--- a/jetty-websocket/websocket-tests/pom.xml
+++ b/jetty-websocket/websocket-tests/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.eclipse.jetty.websocket</groupId>
     <artifactId>websocket-parent</artifactId>
-    <version>9.4.5-SNAPSHOT</version>
+    <version>10.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -55,7 +55,6 @@
       <artifactId>jetty-http</artifactId>
       <version>${project.version}</version>
       <classifier>tests</classifier>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.toolchain</groupId>