[teiid-commits] teiid SVN: r4339 - in trunk/jboss-integration/src/main: resources/org/teiid/jboss and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2012-08-17 15:07:44 -0400 (Fri, 17 Aug 2012)
New Revision: 4339

Modified:
   trunk/jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin.java
   trunk/jboss-integration/src/main/java/org/teiid/jboss/JBossSecurityHelper.java
   trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties
Log:
TEIID-2151 clarifying the exception

Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin.java	2012-08-17 18:20:39 UTC (rev 4338)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/IntegrationPlugin.java	2012-08-17 19:07:44 UTC (rev 4339)
@@ -96,6 +96,7 @@
     	TEIID50077,
     	TEIID50078,
     	TEIID50088,
-    	TEIID50089
+    	TEIID50089, 
+    	TEIID50090, //Missing context
     }
 }

Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/JBossSecurityHelper.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/JBossSecurityHelper.java	2012-08-17 18:20:39 UTC (rev 4338)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/JBossSecurityHelper.java	2012-08-17 19:07:44 UTC (rev 4339)
@@ -29,7 +29,7 @@
 
 import org.jboss.security.SecurityContext;
 import org.jboss.security.SubjectInfo;
-import org.teiid.core.util.Assertion;
+import org.teiid.core.TeiidRuntimeException;
 import org.teiid.security.SecurityHelper;
 
 public class JBossSecurityHelper implements SecurityHelper, Serializable {
@@ -72,7 +72,9 @@
 
 	@Override
 	public boolean sameSubject(String securityDomain, Object context, Subject subject) {
-		Assertion.isNotNull(context);
+		if (context == null) {
+			throw new TeiidRuntimeException("No context associated.  More than like either pass-through authentication should not be used or there are no security domains defined on the embedded transport.");
+		}
 		SecurityContext previousContext = (SecurityContext)context;
 		Subject previousUser = previousContext.getSubjectInfo().getAuthenticatedSubject();
 		

Modified: trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties
===================================================================
--- trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties	2012-08-17 18:20:39 UTC (rev 4338)
+++ trunk/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties	2012-08-17 19:07:44 UTC (rev 4339)
@@ -67,6 +67,7 @@
 TEIID50075=No "path" information found to load the FUNCTION model {0}; FUNCTION model must have path information.
 TEIID50076=For {0}.{1} VDB, recursive delegation {2} found.
 TEIID50077=The translator type "{0}" was not found in configuration; VDB {1}.{2} will not be started until translator is available.
+TEIID50090=No context associated.  Morely than like either pass-through authentication should not be used or there are no security domains defined on the embedded transport.
 wrong_vdb= Wrong VDB name and/or version supplied, or VDB is not active, or not available.
 
 # subsystem description