Author: anil.saldhana(a)jboss.com Date: 2012-02-16 14:50:22 -0500 (Thu, 16 Feb 2012) New Revision: 1402 Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/util/ServerDetector.java Log: PLFED-246: correct the detection of AS7 Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/util/ServerDetector.java =================================================================== --- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/util/ServerDetector.java 2012-02-16 09:39:31 UTC (rev 1401) +++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/util/ServerDetector.java 2012-02-16 19:50:22 UTC (rev 1402) @@ -64,21 +64,26 @@ } catch (Exception e) { - try + } + + //If class is null + try + { + clazz = SecurityActions.loadClass(me, "org.jboss.as.server.Bootstrap"); + if (clazz != null) { - clazz = SecurityActions.loadClass(me, "org.jboss.as.server.Bootstrap"); jboss = true; return; } - catch (Exception ee) - { - } } + catch (Exception e) + { + } //Tomcat try { - clazz = SecurityActions.loadClass(getClass(), "org.apache.cataline.Server"); + clazz = SecurityActions.loadClass(getClass(), "org.apache.catalina.Server"); if (clazz != null) { tomcat = true;