diff -r 836adbf7a2cd -r 3317bb8137f4 jdk/src/java.rmi/share/classes/java/rmi/ServerError.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/java.rmi/share/classes/java/rmi/ServerError.java	Sun Aug 17 15:54:13 2014 +0100
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 1996, 2001, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.rmi;
+
+/**
+ * A <code>ServerError</code> is thrown as a result of a remote method
+ * invocation when an <code>Error</code> is thrown while processing
+ * the invocation on the server, either while unmarshalling the arguments,
+ * executing the remote method itself, or marshalling the return value.
+ *
+ * A <code>ServerError</code> instance contains the original
+ * <code>Error</code> that occurred as its cause.
+ *
+ * @author  Ann Wollrath
+ * @since   1.1
+ */
+public class ServerError extends RemoteException {
+
+    /* indicate compatibility with JDK 1.1.x version of class */
+    private static final long serialVersionUID = 8455284893909696482L;
+
+    /**
+     * Constructs a <code>ServerError</code> with the specified
+     * detail message and nested error.
+     *
+     * @param s the detail message
+     * @param err the nested error
+     * @since 1.1
+     */
+    public ServerError(String s, Error err) {
+        super(s, err);
+    }
+}