Attachment 88472 Details for Bug 199417 – Consolidated patch for 199417 and 157641

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Consolidated patch for 199417 and 157641

199417_and_157641.txt (text/plain), 5.84 KB, created by Rohit Shetty

on 2008-01-31 16:56:26 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Rohit Shetty

Created: 2008-01-31 16:56:26 EST

Size: 5.84 KB

patch

obsolete

>Index: src-common-internal/org/eclipse/hyades/ui/internal/dbresource/DBResourceSupportUICommon.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.common.ui/src-common-internal/org/eclipse/hyades/ui/internal/dbresource/DBResourceSupportUICommon.java,v
>retrieving revision 1.6
>diff -u -r1.6 DBResourceSupportUICommon.java
>--- src-common-internal/org/eclipse/hyades/ui/internal/dbresource/DBResourceSupportUICommon.java	24 Jan 2008 02:29:12 -0000	1.6
>+++ src-common-internal/org/eclipse/hyades/ui/internal/dbresource/DBResourceSupportUICommon.java	31 Jan 2008 21:44:28 -0000
>@@ -177,15 +177,20 @@
> 		storeValues();
> 		URI testUri = URI.createURI("testConnection-1234567890"+getAgentNamePostfix());
> 		File f = new File("testConnection-1234567890"+getAgentNamePostfix());
>+		Resource resource = null;
> 		try {
> 			f.delete();
>-			Resource resource =  HierarchyResourceSetImpl.getInstance().createResource(testUri);
>+			resource =  HierarchyResourceSetImpl.getInstance().createResource(testUri);
> 			TRCAgent agent=HierarchyFactory.eINSTANCE.createTRCAgent();
> 			resource.getContents().add(agent);
> 			resource.save(Collections.EMPTY_MAP);
> 		} catch (Throwable e) {
> 			return e;
> 		} finally {
>+		    if(resource !=null)
>+		    {
>+		        HierarchyResourceSetImpl.getInstance().getResources().remove(resource);
>+		    }
> 			f.delete();
> //			deleteTestFile(testUri);
> 		}
>Index: src-common-internal/org/eclipse/hyades/ui/internal/dbresource/DBResourceSupportUI.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.common.ui/src-common-internal/org/eclipse/hyades/ui/internal/dbresource/DBResourceSupportUI.java,v
>retrieving revision 1.4
>diff -u -r1.4 DBResourceSupportUI.java
>--- src-common-internal/org/eclipse/hyades/ui/internal/dbresource/DBResourceSupportUI.java	24 Jan 2008 02:29:12 -0000	1.4
>+++ src-common-internal/org/eclipse/hyades/ui/internal/dbresource/DBResourceSupportUI.java	31 Jan 2008 21:44:28 -0000
>@@ -150,12 +150,12 @@
> 			newStore.setValue(currentResourcePostFix + "/" + IHyadesResourceExtension.LRSP_LOCATION, location.getText());
> 			newStore.setValue(currentResourcePostFix + "/" + IHyadesResourceExtension.LRSP_USERNAME, username.getText());
> 			newStore.setValue(currentResourcePostFix + "/" + IHyadesResourceExtension.LRSP_PASSWORD, LoadersUtils.scramblePassword(password.getText()));
>-			Properties p = (Properties)HyadesResourceExtensions.getInstance().getAllProperties().get(currentResourcePostFix);
>-			if(p==null)
>-			{
>-				p = new Properties();
>-				HyadesResourceExtensions.getInstance().getAllProperties().put(currentResourcePostFix,p);
>-			}
>+			
>+			//bugzilla 157641 - The same properties map gets passed to the DB handler, so if any values are changed here 
>+			//it would change in the instance available with the DB Handler thus currupting it. So ensure that you pass a new
>+			//properties map
>+			Properties p = new Properties();
>+            HyadesResourceExtensions.getInstance().getAllProperties().put(currentResourcePostFix,p);
> 			p.setProperty("largeResourceSupportJDBCLocation", jdbcLocation.getText());
> 			p.setProperty("location", location.getText());
> 			p.setProperty("user", username.getText());
>@@ -169,12 +169,12 @@
> 		} else {
> 			newStore.setValue(IHyadesResourceExtension.LARGE_RESOURCE_SUPPORT_CURRENT_DB_TYPE, "");
> 			newStore.setValue(currentResourcePostFix + "/" + "largeResourceSupportJDBCLocation", "");
>-			Properties p = (Properties)HyadesResourceExtensions.getInstance().getAllProperties().get(currentResourcePostFix);
>-			if(p==null)
>-			{
>-				p = new Properties();
>-				HyadesResourceExtensions.getInstance().getAllProperties().put(currentResourcePostFix,p);
>-			}
>+			
>+			//bugzilla 157641 - The same properties map gets passed to the DB handler, so if any values are changed here 
>+            //it would change in the instance available with the DB Handler thus currupting it. So ensure that you pass a new
>+            //properties map
>+			Properties p = new Properties();
>+            HyadesResourceExtensions.getInstance().getAllProperties().put(currentResourcePostFix,p);
> 			p.setProperty("largeResourceSupportJDBCLocation", "");
> 			p.setProperty("location", "");
> 			p.setProperty("user", "");
>@@ -234,7 +234,8 @@
> 		setPageComplete(true, null);
> 		if (enableDBRS.getSelection()) {
> 			if (!skipJDBCcheck && !isValidJDBCType()) {
>-				setPageComplete(false, CommonUIMessages._64);
>+			    String jarLocation = jdbcLocation.getText();
>+				setPageComplete(false, (jarLocation == null || jarLocation.equals(""))?null:CommonUIMessages._64);
> 			}
> 			if (jdbcLocation.getText().endsWith(File.separator + "db2jcc.jar")) {
> 				if (location == null || location.getText().equals(""))
>Index: src-common-internal/org/eclipse/tptp/platform/common/ui/internal/messages.properties
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.common.ui/src-common-internal/org/eclipse/tptp/platform/common/ui/internal/messages.properties,v
>retrieving revision 1.10
>diff -u -r1.10 messages.properties
>--- src-common-internal/org/eclipse/tptp/platform/common/ui/internal/messages.properties	22 Jan 2008 16:01:46 -0000	1.10
>+++ src-common-internal/org/eclipse/tptp/platform/common/ui/internal/messages.properties	31 Jan 2008 21:44:28 -0000
>@@ -86,9 +86,9 @@
> _62  = Unknown
> _63  = None
> _64  = Invalid JDBC driver
>-_65  = Invalid database location
>-_66  = Invalid username
>-_67  = Invalid password
>+_65  = Please specify the database location
>+_66  = Please specify the username
>+_67  = Please specify the password
> _68  = Connection completed without errors.
> _69	 = Error when trying to connect:
> _70  = The ZoomSlider's maximum value must be greater than its minimum value!

Actions: View | Diff

Attachments on bug 199417: 88472