[Arianne-commits] stendhal/src/games/stendhal/client/update Bootstrap.java, 1.82, 1.83

[Hendrik B. <nh...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/client/update
In directory vz-cvs-4.sog:/tmp/cvs-serv26007/src/games/stendhal/client/update

Modified Files:
	Bootstrap.java 
Log Message:
workaround for java.lang.SecurityException: Prohibited package name: java.lang (fixes #3349152)

Index: Bootstrap.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/update/Bootstrap.java,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** Bootstrap.java	24 Feb 2011 23:21:40 -0000	1.82
--- Bootstrap.java	1 Jul 2011 21:14:03 -0000	1.83
***************
*** 21,25 ****
  /**
   * Starts a program after doing some classpath magic.
!  * 
   * @author hendrik
   */
--- 21,25 ----
  /**
   * Starts a program after doing some classpath magic.
!  *
   * @author hendrik
   */
***************
*** 43,47 ****
  		/**
  		 * Creates a bottom up order class loader.
! 		 * 
  		 * @param urls
  		 *            classpath
--- 43,47 ----
  		/**
  		 * Creates a bottom up order class loader.
! 		 *
  		 * @param urls
  		 *            classpath
***************
*** 63,66 ****
--- 63,68 ----
  				} catch (final ClassNotFoundException e) {
  					clazz = parent.loadClass(name);
+ 				} catch (final SecurityException e) {
+ 					clazz = parent.loadClass(name);
  				}
  			}
***************
*** 86,90 ****
  	/**
  	 * saves modified boot properties to disk.
! 	 * 
  	 * @throws IOException
  	 *             if an IO-error occurs
--- 88,92 ----
  	/**
  	 * saves modified boot properties to disk.
! 	 *
  	 * @throws IOException
  	 *             if an IO-error occurs
***************
*** 123,127 ****
  	/**
  	 * Sets a dynamic classpath up and returns a Class reference loaded from it.
! 	 * 
  	 * @return ClassLoader object
  	 * @throws Exception
--- 125,129 ----
  	/**
  	 * Sets a dynamic classpath up and returns a Class reference loaded from it.
! 	 *
  	 * @return ClassLoader object
  	 * @throws Exception
***************
*** 171,175 ****
  	/**
  	 * Do the whole start up process in a privileged block.
! 	 * @param <T> 
  	 */
  	private class PrivilegedBoot<T> implements PrivilegedAction<T> {
--- 173,177 ----
  	/**
  	 * Do the whole start up process in a privileged block.
! 	 * @param <T>
  	 */
  	private class PrivilegedBoot<T> implements PrivilegedAction<T> {
***************
*** 181,185 ****
  		/**
  		 * Creates a PrivilagedBoot object.
! 		 * 
  		 * @param className
  		 *            className to boot
--- 183,187 ----
  		/**
  		 * Creates a PrivilagedBoot object.
! 		 *
  		 * @param className
  		 *            className to boot
***************
*** 273,277 ****
  	 * Is this package signed? Note it does not validate the signature, just
  	 * looks for the presence of one.
! 	 * 
  	 * @return true, if there is some kind of signature; false otherwise
  	 */
--- 275,279 ----
  	 * Is this package signed? Note it does not validate the signature, just
  	 * looks for the presence of one.
! 	 *
  	 * @return true, if there is some kind of signature; false otherwise
  	 */
***************
*** 285,289 ****
  	 * Starts the main-method of specified class after dynamically building the
  	 * classpath.
! 	 * 
  	 * @param className
  	 *            name of class with "main"-method
--- 287,291 ----
  	 * Starts the main-method of specified class after dynamically building the
  	 * classpath.
! 	 *
  	 * @param className
  	 *            name of class with "main"-method
***************
*** 344,348 ****
  	/**
  	 * Handles exceptions during program invocation.
! 	 * 
  	 * @param message
  	 * @param t
--- 346,350 ----
  	/**
  	 * Handles exceptions during program invocation.
! 	 *
  	 * @param message
  	 * @param t
***************
*** 392,396 ****
  
  	/**
! 	 * converts a Throwable into a string representation 
  	 * @param e throwable
  	 * @return string
--- 394,398 ----
  
  	/**
! 	 * converts a Throwable into a string representation
  	 * @param e throwable
  	 * @return string