[teiid-commits] teiid SVN: r592 - in trunk: embedded/src/main/java/com/metamatrix/dqp/embedded/admin and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: rareddy
Date: 2009-03-19 13:17:58 -0400 (Thu, 19 Mar 2009)
New Revision: 592

Modified:
   trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/Translator.java
   trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/BaseAdmin.java
Log:
TEIID-66: problems found during the designer integration

Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/Translator.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/Translator.java	2009-03-18 20:11:01 UTC (rev 591)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/translator/Translator.java	2009-03-19 17:17:58 UTC (rev 592)
@@ -106,7 +106,12 @@
     };
     public final static TimeZone DEFAULT_TIME_ZONE = TimeZone.getDefault();
 
-    private static final ThreadLocal<Calendar> CALENDAR = new ThreadLocal<Calendar>();
+    private static final ThreadLocal<Calendar> CALENDAR = new ThreadLocal<Calendar>() {
+    	@Override
+    	protected Calendar initialValue() {
+    		return Calendar.getInstance();
+    	}
+    };
 
 	private Map<String, FunctionModifier> functionModifiers = new HashMap<String, FunctionModifier>();
     private ConnectorEnvironment environment;
@@ -135,8 +140,6 @@
         	TimeZone tz = TimeZone.getTimeZone(timeZone);
             if(!DEFAULT_TIME_ZONE.hasSameRules(tz)) {
         		CALENDAR.set(Calendar.getInstance(tz));
-            } else {
-            	CALENDAR.set(Calendar.getInstance());
             }
         }   
         

Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/BaseAdmin.java
===================================================================
--- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/BaseAdmin.java	2009-03-18 20:11:01 UTC (rev 591)
+++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/BaseAdmin.java	2009-03-19 17:17:58 UTC (rev 592)
@@ -300,7 +300,7 @@
      * @since 4.3
      */
     private com.metamatrix.admin.api.objects.ConnectorBinding convertConnectorType(final com.metamatrix.common.config.api.ConnectorBinding src, final Object parent) {
-        MMConnectorBinding binding = new MMConnectorBinding(new String[] {src.getDeployedName(), "Embedded"}); //$NON-NLS-1$
+        MMConnectorBinding binding = new MMConnectorBinding(new String[] {src.getDeployedName()});
         
         binding.setConnectorTypeName(src.getComponentTypeID().getFullName());
         binding.setCreated(src.getCreatedDate());