From 3a1eec04eae50fcd8523514cbd7e8fa71b5241e1 Mon Sep 17 00:00:00 2001
From: xinzhao-acutate <xzhao@actuate.com>
Date: Thu, 20 Nov 2014 18:02:12 -0800
Subject: [PATCH] Revert "- Summary:"

This reverts commit 92dba2d3c5e197c5da097b03290d1579be55ff16.
---
 .../data/oda/jdbc/ResultSetMetaData.java      |  5 -----
 .../birt/report/data/oda/jdbc/Statement.java  | 21 +++----------------
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/data/org.eclipse.birt.report.data.oda.jdbc/src/org/eclipse/birt/report/data/oda/jdbc/ResultSetMetaData.java b/data/org.eclipse.birt.report.data.oda.jdbc/src/org/eclipse/birt/report/data/oda/jdbc/ResultSetMetaData.java
index 296e99610da..eb615261d8f 100644
--- a/data/org.eclipse.birt.report.data.oda.jdbc/src/org/eclipse/birt/report/data/oda/jdbc/ResultSetMetaData.java
+++ b/data/org.eclipse.birt.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/data/org.eclipse.birt.report.data.oda.jdbc/src/org/eclipse/birt/report/data/oda/jdbc/Statement.java b/data/org.eclipse.birt.report.data.oda.jdbc/src/org/eclipse/birt/report/data/oda/jdbc/Statement.java
index ef1157d732c..02ef63f5add 100644
--- a/data/org.eclipse.birt.report.data.oda.jdbc/src/org/eclipse/birt/report/data/oda/jdbc/Statement.java
+++ b/data/org.eclipse.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