Index: ConnectionRepositoryEntry.java
===================================================================
--- ConnectionRepositoryEntry.java	(révision 453146)
+++ ConnectionRepositoryEntry.java	(copie de travail)
@@ -272,7 +272,6 @@
         {
             platform = null;
         }
-        DataSource ds = null;
         JdbcMetadataUtils jdbcMetadataUtils = new JdbcMetadataUtils ();
         if (jndiName != null)
         {
@@ -282,7 +281,7 @@
                 connectionFactoryClass = ConnectionFactoryManagedImpl.class.getName ();
             }
             Context initialContext = new InitialContext();
-            ds = (DataSource) initialContext.lookup(jndiName);
+            dataSource = (DataSource) initialContext.lookup(jndiName);
             jcd.setDatasourceName(jndiName);
         } 
         else 
@@ -306,7 +305,7 @@
             // fillJCDFromDataSource as public (and these do not require a DataSource)
             // the method itself does more than is made available by the exposed methods.
             // ds = new MinimalDataSource (jcd);
-            ds = this;             
+            dataSource = this;
         }
         ConnectionPoolDescriptor cpd = jcd.getConnectionPoolDescriptor();
         if (cpd == null)
@@ -317,11 +316,11 @@
         Class conFacCls = ClassHelper.getClass(connectionFactoryClass);
         cpd.setConnectionFactory(conFacCls);
 
-        jdbcMetadataUtils.fillJCDFromDataSource(jcd, ds, null, null);
+        jdbcMetadataUtils.fillJCDFromDataSource(jcd, dataSource, null, null);
         
         if (platform == null && JdbcMetadataUtils.PLATFORM_ORACLE.equals(jcd.getDbms())) {
             // Postprocess to find Oracle version.
-            updateOraclePlatform (jcd, ds);
+            updateOraclePlatform (jcd, dataSource);
         }
         // if platform has explicitly been set, the value takes precedence
         if (platform != null) {
@@ -333,7 +332,6 @@
         } else {
             platform = jcd.getDbms();
         }
-        
         // special attributes
         jcd.addAttribute("org.apache.jetspeed.engineScoped", 
                          Boolean.toString(jetspeedEngineScoped));