db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r599086 - /db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java
Date Wed, 28 Nov 2007 18:36:02 GMT
Author: rhillegas
Date: Wed Nov 28 10:35:49 2007
New Revision: 599086

URL: http://svn.apache.org/viewvc?rev=599086&view=rev
Log:
DERBY-3083: Revert 597125.

Modified:
    db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java

Modified: db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java?rev=599086&r1=599085&r2=599086&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java Wed Nov
28 10:35:49 2007
@@ -545,7 +545,6 @@
      * <li>The command must be "start".</li>
      * <li>The customer didn't specify the -noSecurityManager flag on the startup command
      * line.</li>
-     * <li>Classes live in the jar files which we expect..</li>
      * </ul>
      */
     private static  boolean needsSecurityManager( NetworkServerControlImpl server, int command
)
@@ -555,28 +554,10 @@
             (
              (System.getSecurityManager() == null) &&
              (command == NetworkServerControlImpl.COMMAND_START) &&
-             (!server.runningUnsecure()) &&
-             (packagingLooksGood())
+             (!server.runningUnsecure())
              );
    }
     
-    /**
-     * Return true if the server lives in the expected jar file. This
-     * is meant to address DERBY-3083. We expect that the URL of
-     * the jar which contains NetworkServerControl will end with the
-     * string "derbynet.jar". If this is true, then getCodeSourcePrefix()
-     * will return a prefix which can be substituted into the default
-     * server policy file and so end up granting permissions to the server jar file.
-     */
-    private static  boolean packagingLooksGood()
-        throws Exception
-    {
-        String      derbyNetURL = NetworkServerControl.class.getProtectionDomain().getCodeSource().getLocation().toExternalForm();
-
-        return derbyNetURL.endsWith( DERBYNET_JAR );
-    }
-
-
     /**
      * Verify that all prerequisites are met before bringing up a security
      * manager. See DERBY-2196. If prerequisites aren't met, raise an



Mime
View raw message