3 files changed, 13 insertions, 0 deletions
diff --git a/java/rmi/Naming.java b/java/rmi/Naming.java
index 74ad96262..4df904521 100644
--- a/java/rmi/Naming.java
+++ b/java/rmi/Naming.java
@@ -44,6 +44,10 @@ import java.rmi.registry.LocateRegistry;
 import java.rmi.registry.Registry;
 
 public final class Naming {
+  /**
+   * This class isn't intended to be instantiated.
+   */
+  private Naming() {}
 
 /**
  * Looks for the remote object that is associated with the named service.
diff --git a/java/rmi/registry/LocateRegistry.java b/java/rmi/registry/LocateRegistry.java
index aaf9333f3..58452158c 100644
--- a/java/rmi/registry/LocateRegistry.java
+++ b/java/rmi/registry/LocateRegistry.java
@@ -50,6 +50,10 @@ import java.rmi.server.RMISocketFactory;
 import java.rmi.server.RemoteRef;
 
 public final class LocateRegistry {
+  /**
+   * This class isn't intended to be instantiated.
+   */
+  private LocateRegistry() {}
 
 public static Registry getRegistry() throws RemoteException {
 	return (getRegistry("localhost", Registry.REGISTRY_PORT));
diff --git a/java/rmi/server/RMIClassLoader.java b/java/rmi/server/RMIClassLoader.java
index 006bc4539..6add274ef 100644
--- a/java/rmi/server/RMIClassLoader.java
+++ b/java/rmi/server/RMIClassLoader.java
@@ -55,6 +55,11 @@ import java.util.StringTokenizer;
  */
 public class RMIClassLoader
 {
+  /**
+   * This class isn't intended to be instantiated.
+   */
+  private RMIClassLoader() {}
+
   private static class MyClassLoader extends URLClassLoader
   {
     // Package-private to avoid a trampoline constructor.