Index: D:/WorkspaceGT-2/gt/modules/unsupported/oracle-spatial/src/main/java/org/geotools/data/oracle/OracleDataStore.java
===================================================================
--- D:/WorkspaceGT-2/gt/modules/unsupported/oracle-spatial/src/main/java/org/geotools/data/oracle/OracleDataStore.java	(revision 27453)
+++ D:/WorkspaceGT-2/gt/modules/unsupported/oracle-spatial/src/main/java/org/geotools/data/oracle/OracleDataStore.java	(working copy)
@@ -70,6 +70,7 @@
 import org.opengis.feature.simple.SimpleFeatureType;
 import org.opengis.filter.Filter;
 import org.opengis.referencing.FactoryException;
+import org.opengis.referencing.NoSuchAuthorityCodeException;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 import org.opengis.referencing.crs.GeodeticCRS;
 
@@ -212,15 +213,20 @@
         } catch (Exception e) {
             LOGGER.warning("could not determin Geometry class");
         }
-		try {
-			srid = determineSRID( tableName, columnName );
-//			CoordinateReferenceSystem crs = determineCRS( srid );
-            CoordinateReferenceSystem crs = CRS.decode("EPSG:" + srid);
-            build.setCRS(crs);
-    
-		} catch (Exception e) {
-			LOGGER.warning( "Could not map SRID "+srid+" to CRS:"+e );
-		}
+        
+        CoordinateReferenceSystem crs = null;
+        try {
+        	srid = determineSRID( tableName, columnName );
+        	try {
+        	    crs = CRS.decode("EPSG:" + srid);
+        	} catch(Exception e) {
+        	    // decode failed, let's try the internal authority
+        	    crs = determineCRS(srid);
+        	}
+        } catch (Exception e) {
+        	LOGGER.warning( "Could not map SRID "+srid+" to CRS:"+e );
+        }
+        build.setCRS(crs);
 		return build.buildDescriptor(columnName);		
 	}
     private Class determineGeometryClass(String tableName, String columnName) throws IOException {