You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2011/09/18 14:04:13 UTC
svn commit: r1172263 - in /incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH:
ChangeLog src/com/ecyrd/jspwiki/Release.java
src/com/ecyrd/jspwiki/auth/SessionMonitor.java
Author: metskem
Date: Sun Sep 18 12:04:13 2011
New Revision: 1172263
URL: http://svn.apache.org/viewvc?rev=1172263&view=rev
Log:
2011-09-18 Harry Metske <me...@apache.org>
* 2.8.5-svn-8
* fixed JSPWIKI-705 (Log a clear hint to a running security manager).
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/auth/SessionMonitor.java
Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog?rev=1172263&r1=1172262&r2=1172263&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog Sun Sep 18 12:04:13 2011
@@ -1,3 +1,9 @@
+2011-09-18 Harry Metske <me...@apache.org>
+
+ * 2.8.5-svn-8
+
+ * fixed JSPWIKI-705 (Log a clear hint to a running security manager).
+
2011-08-07 Harry Metske <me...@apache.org>
* 2.8.5-svn-7
Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java?rev=1172263&r1=1172262&r2=1172263&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java Sun Sep 18 12:04:13 2011
@@ -77,7 +77,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "7";
+ public static final String BUILD = "8";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/auth/SessionMonitor.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/auth/SessionMonitor.java?rev=1172263&r1=1172262&r2=1172263&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/auth/SessionMonitor.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/auth/SessionMonitor.java Sun Sep 18 12:04:13 2011
@@ -46,6 +46,15 @@ import com.ecyrd.jspwiki.rpc.json.JSONRP
*/
public class SessionMonitor implements HttpSessionListener
{
+ static
+ {
+ // check for security manager active (JSPWiki does not run if a security manager is active)
+ if( System.getSecurityManager() != null )
+ {
+ throw new RuntimeException( "FATAL ERROR: An active Java Security Manager was found, JSPWiki will not work !!" );
+ }
+ }
+
private static Logger log = Logger.getLogger( SessionMonitor.class );
/** Map with WikiEngines as keys, and SessionMonitors as values. */