--- old/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java 2014-02-25 16:07:28.143337592 +0800 +++ new/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java 2014-02-25 16:07:27.927337582 +0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 1999, 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 @@ -160,33 +160,7 @@ for (; i < 7; i++) { System.err.println("Activate object via method call"); - - /* - * Fix for 4277196: if we got an inactive group - * exception, it is likely that we accidentally - * invoked a method on an old activation - * group. Give some time for the group to go away - * and then retry the activation. - */ - try { - obj.ping(); - } catch (RemoteException e) { - Exception detail = (Exception) e.detail; - if ((detail != null) && - (detail instanceof ActivationException) && - (detail.getMessage().equals("group is inactive"))) - { - try { - Thread.sleep(5000); - } catch (InterruptedException ex) { - } - obj.ping(); - - } else { - throw e; - } - } - + obj.ping(); System.err.println("proxy = " + obj); /*