Revert "- Summary:"

This reverts commit 92dba2d.
eclipse-birt · Nov 21, 2014 · 3a1eec0 · 3a1eec0
1 parent d87ac2b
commit 3a1eec0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 23 deletions.
diff --git a/...irt.report.data.oda.jdbc/src/org/eclipse/birt/report/data/oda/jdbc/ResultSetMetaData.java b/...irt.report.data.oda.jdbc/src/org/eclipse/birt/report/data/oda/jdbc/ResultSetMetaData.java
@@ -108,11 +108,6 @@ public String getColumnName( int index ) throws OdaException
              * will return the actual name of the column, if it exists, and this name can *not* be used as input to
 			 * ResultSet.findColumn() or ResultSet.get...(String).
 			 */
-			String label = rsMetadata.getColumnLabel( index );
-			if ( label != null && label.length() > 0 )
-			{
-				return label;
-			}
 			return rsMetadata.getColumnName( index );
 		}
 		catch ( SQLException e )

diff --git a/...clipse.birt.report.data.oda.jdbc/src/org/eclipse/birt/report/data/oda/jdbc/Statement.java b/...clipse.birt.report.data.oda.jdbc/src/org/eclipse/birt/report/data/oda/jdbc/Statement.java
@@ -417,24 +417,9 @@ private void getMetaUsingPolicy0( )
 	 */
 	private void getMetaUsingPolicy1( ) throws OdaException
 	{
-		try
-		{
-			this.cachedResultSet = executeQuery( );
-			if ( this.cachedResultSet != null )
-			{
-				cachedResultMetaData = this.cachedResultSet.getMetaData( );
-			}
-		}
-		catch ( OdaException e )
-		{
-			logger.log( Level.WARNING, e.getLocalizedMessage( ), e );
-			try
-			{
-				cachedResultMetaData = new ResultSetMetaData( this.preStat.getMetaData() );
-			} catch (SQLException e1) {
-				logger.log( Level.WARNING, e1.getLocalizedMessage( ), e1 );
-			}
-		}
+		this.cachedResultSet = executeQuery( );
+		if ( this.cachedResultSet != null )
+			cachedResultMetaData = this.cachedResultSet.getMetaData( );
 	}
 
 	private void getMetaUsingPolicy2( ) throws OdaException