--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/rmi/activation/Activatable/createPrivateActivable/CreatePrivateActivatable.java	Sat Dec 01 00:00:00 2007 +0000
@@ -0,0 +1,164 @@
+/* 
+ * Copyright 1999-2001 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ * @author Laird Dornin
+ * @bug 4164971
+ * @summary allow non-public activatable class and/or constructor
+ *
+ * @library ../../../testlibrary
+ * @build TestLibrary RMID
+ * @build ActivateMe
+ * @build CreatePrivateActivatable
+ * @run main/othervm/policy=security.policy/timeout=240 CreatePrivateActivatable
+ */
+
+import java.io.*;
+import java.rmi.*;
+import java.rmi.server.*;
+import java.rmi.activation.*;
+import sun.rmi.server.ActivatableRef;
+import java.lang.reflect.*;
+import java.util.Properties;
+
+/**
+ * Test creates a private inner class Activatable object with a
+ * private constructor and makes sure that the object can be
+ * activated.
+ */
+public class CreatePrivateActivatable
+{
+    private static class PrivateActivatable extends Activatable
+	implements ActivateMe, Runnable
+    {
+	private PrivateActivatable(ActivationID id, MarshalledObject obj)
+	    throws ActivationException, RemoteException
+	{
+	    super(id, 0);
+	}
+
+	public void ping()
+	{}
+
+	/**
+	 * Spawns a thread to deactivate the object.
+	 */
+	public void shutdown() throws Exception
+	{
+	    (new Thread(this, "CreatePrivateActivatable$PrivateActivatable")).start();
+	}
+
+	/**
+	 * Thread to deactivate object. First attempts to make object
+	 * inactive (via the inactive method).  If that fails (the
+	 * object may still have pending/executing calls), then
+	 * unexport the object forcibly.
+	 */
+	public void run() {
+	    ActivationLibrary.deactivate(this, getID());
+	}
+    }
+    
+    public static void main(String[] args)  {
+	/*
+	 * The following line is required with the JDK 1.2 VM so that the
+	 * VM can exit gracefully when this test completes.  Otherwise, the
+	 * conservative garbage collector will find a handle to the server
+	 * object on the native stack and not clear the weak reference to
+	 * it in the RMI runtime's object table.
+	 */
+	Object dummy = new Object();
+	RMID rmid = null;
+	ActivateMe obj;
+
+	System.err.println("\nRegression test for bug 4164971\n");
+	System.err.println("java.security.policy = " +
+			   System.getProperty("java.security.policy", "no policy"));
+
+	CreatePrivateActivatable server;
+	try {
+	    TestLibrary.suggestSecurityManager(TestParams.defaultSecurityManager);
+
+	    // start an rmid.
+  	    RMID.removeLog();
+  	    rmid = RMID.createRMID();
+  	    rmid.start();
+	    
+	    /* Cause activation groups to have a security policy that will
+	     * allow security managers to be downloaded and installed
+	     */
+	    Properties p = new Properties();
+	    // this test must always set policies/managers in its
+	    // activation groups
+	    p.put("java.security.policy", 
+		  TestParams.defaultGroupPolicy);
+	    p.put("java.security.manager", 
+		  TestParams.defaultSecurityManager);
+	    
+	    /*
+	     * Activate an object by registering its object
+	     * descriptor and invoking a method on the
+	     * stub returned from the register call.
+	     */
+	    ActivationGroupDesc groupDesc =
+		new ActivationGroupDesc(p, null);
+	    ActivationSystem system = ActivationGroup.getSystem();
+	    ActivationGroupID groupID = system.registerGroup(groupDesc);
+
+	    System.err.println("Creating descriptor");
+	    ActivationDesc desc =
+		new ActivationDesc(groupID,
+		    "CreatePrivateActivatable$PrivateActivatable",
+		     null, null);
+	    
+	    System.err.println("Registering descriptor");
+	    obj = (ActivateMe) Activatable.register(desc);
+	    
+	    /*
+	     * Loop a bunch of times to force activator to
+	     * spawn VMs (groups)
+	     */
+	    System.err.println("Activate object via method call");
+	    obj.ping();
+		
+	    /*
+	     * Clean up object too.
+	     */
+	    System.err.println("Deactivate object via method call");
+	    obj.shutdown();
+	    
+	    System.err.println("\nsuccess: CreatePrivateActivatable test passed ");
+	
+	} catch (Exception e) {
+	    if (e instanceof java.security.PrivilegedActionException) {
+		e = ((java.security.PrivilegedActionException)e).getException();
+	    }
+	    TestLibrary.bomb("\nfailure: unexpected exception " +
+			     e.getClass().getName(), e);
+	    
+	} finally {
+	    ActivationLibrary.rmidCleanup(rmid);
+	    obj = null;
+	}
+    }
+}