svn commit: r1591404 - /oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/DataSourceMetExtractor.java

[bfoster]

Author: bfoster
Date: Wed Apr 30 17:18:38 2014
New Revision: 1591404

URL: http://svn.apache.org/r1591404
Log:
- Fixes reading data from ResultSet

Modified:
    
oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/DataSourceMetExtractor.java

Modified: 
oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/DataSourceMetExtractor.java
URL: 
http://svn.apache.org/viewvc/oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/DataSourceMetExtractor.java?rev=1591404&r1=1591403&r2=1591404&view=diff
==============================================================================
--- 
oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/DataSourceMetExtractor.java
 (original)
+++ 
oodt/trunk/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/DataSourceMetExtractor.java
 Wed Apr 30 17:18:38 2014
@@ -92,10 +92,14 @@ public class DataSourceMetExtractor exte
 
   private Metadata getMetadata(ResultSet rs) throws SQLException {
     Metadata metadata = new Metadata();
-    for (int i = 0; i < rs.getMetaData().getColumnCount(); i++) {
-      String metKey = rs.getMetaData().getColumnName(i);
-      String metVal = rs.getString(i);
-      metadata.addMetadata(metKey, metVal);
+    if (rs.next()) {
+      for (int i = 0; i < rs.getMetaData().getColumnCount(); i++) {
+        String metKey = rs.getMetaData().getColumnName(i+1);
+        String metVal = rs.getString(i+1);
+        metadata.addMetadata(metKey, metVal);
+      }
+    } else {
+      throw new SQLException("Failed to find metadata for result set");
     }
     return metadata;
   }