Commits

Tim Olsen committed 536022e

Modified Exception checking to use SQLException instead of PSQLException. Dependency on PGSQL is not necessary.

Comments (0)

Files changed (1)

src/main/java/org/nrg/xdat/turbine/modules/actions/XDATLoginUser.java

  */
 package org.nrg.xdat.turbine.modules.actions;
 
+import java.sql.SQLException;
+
 import javax.servlet.http.HttpSession;
 
 import org.apache.commons.lang.StringEscapeUtils;
 import org.nrg.xdat.turbine.utils.TurbineUtils;
 import org.nrg.xft.XFTItem;
 import org.nrg.xft.schema.Wrappers.GenericWrapper.GenericWrapperElement;
-import org.postgresql.util.PSQLException;
 /**
  * @author Tim
  *
             }
 
 				// Set Error Message and clean out the user.
-            if(e instanceof PSQLException){
+            if(e instanceof SQLException){
 				data.setMessage("An error has occurred.  Please contact a site administrator for assistance.");
             }else{
 				data.setMessage(e.getMessage());
             }
-				String loginTemplate =  org.apache.turbine.Turbine.getConfiguration().getString("template.login");
+            
+			String loginTemplate =  org.apache.turbine.Turbine.getConfiguration().getString("template.login");
 
-				if (StringUtils.isNotEmpty(loginTemplate))
-				{
-					// We're running in a templating solution
-					data.setScreenTemplate(loginTemplate);
-				}
-				else
-				{
-					data.setScreen(org.apache.turbine.Turbine.getConfiguration().getString("screen.login"));
-				}
+			if (StringUtils.isNotEmpty(loginTemplate))
+			{
+				// We're running in a templating solution
+				data.setScreenTemplate(loginTemplate);
+			}
+			else
+			{
+				data.setScreen(org.apache.turbine.Turbine.getConfiguration().getString("screen.login"));
+			}
 		}
 	}