Merged with the default branch.

1 files changed, 38 insertions, 0 deletions

diff --git a/src/java/javax/websocket/EncodeException.java b/src/java/javax/websocket/EncodeException.java
new file mode 100644
index 00000000..fdb536ac
--- /dev/null
+++ b/src/java/javax/websocket/EncodeException.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package javax.websocket;
+
+public class EncodeException extends Exception {
+
+    private static final long serialVersionUID = 1L;
+
+    private Object object;
+
+    public EncodeException(Object object, String message) {
+        super(message);
+        this.object = object;
+    }
+
+    public EncodeException(Object object, String message, Throwable cause) {
+        super(message, cause);
+        this.object = object;
+    }
+
+    public Object getObject() {
+        return this.object;
+    }
+}