From b3aee8e4d58cc93043c4e7068140b2dd709aa877 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 15 Jul 2013 10:41:40 -0700
Subject: [PATCH] JSR-356 - fixing NPE on Extension.getParameters()

---
 .../java/org/eclipse/jetty/websocket/jsr356/JsrExtension.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/JsrExtension.java b/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/JsrExtension.java
index b49a2761856..1c050f6628b 100644
--- a/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/JsrExtension.java
+++ b/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/JsrExtension.java
@@ -53,7 +53,7 @@ public class JsrExtension implements Extension
     }
 
     private final String name;
-    private List<Parameter> parameters;
+    private List<Parameter> parameters = new ArrayList<>();
 
     /**
      * A configured extension
@@ -61,7 +61,6 @@ public class JsrExtension implements Extension
     public JsrExtension(ExtensionConfig cfg)
     {
         this.name = cfg.getName();
-        this.parameters = new ArrayList<>();
         if (cfg.getParameters() != null)
         {
             for (Map.Entry<String, String> entry : cfg.getParameters().entrySet())