Attachment 98908 Details for Bug 225625 – Patch for this defect.

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

[patch] Patch for this defect.

p225625.txt (text/plain), 2.90 KB, created by Peter Moogk

on 2008-05-06 14:34:10 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Moogk

Created: 2008-05-06 14:34:10 EDT

Size: 2.90 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.ws.axis.consumption.core
>Index: src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java,v
>retrieving revision 1.21
>diff -u -r1.21 WSDL2JavaCommand.java
>--- src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java	30 Oct 2007 20:57:11 -0000	1.21
>+++ src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java	6 May 2008 18:32:38 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2003, 2007 IBM Corporation and others.
>+ * Copyright (c) 2003, 2008 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -15,6 +15,7 @@
>  * 20060515   115225 sengpl@ca.ibm.com - Seng Phung-Lu
>  * 20070813   188999 pmoogk@ca.ibm.com - Peter Moogk
>  * 20070927   204649 kelvinhc@ca.ibm.com - Kelvin Cheung
>+ * 20080505   225625 pmoogk@ca.ibm.com - Peter Moogk, Fixed null pointer problem, if user cancells out of overwrite resource.
>  *******************************************************************************/
> package org.eclipse.jst.ws.internal.axis.consumption.core.command;
> 
>@@ -25,6 +26,7 @@
> import java.util.HashMap;
> import java.util.Iterator;
> import java.util.List;
>+import java.util.Vector;
> 
> import org.apache.axis.constants.Scope;
> import org.apache.axis.wsdl.toJava.Emitter;
>@@ -282,7 +284,7 @@
> 			
> 			String javaFile;
> 			String fullClassName = null;
>-			String [] movedJavaFiles =  new String [javaFiles.size()];
>+			Vector movedJavaFiles =  new Vector();;
> 			iterator = javaFiles.iterator();
> 			i = 0;
> 			while (iterator.hasNext()) {
>@@ -301,15 +303,19 @@
> 									finStream,
> 									monitor,
> 									statusHandler);
>-							file.setCharset("UTF-8", monitor);
>-							movedJavaFiles[i++]= ResourceUtils.getWorkspaceRoot().getFileForLocation(targetPath).getLocation().toString();
>+							
>+							if( file != null )
>+							{
>+							  file.setCharset("UTF-8", monitor);
>+							  movedJavaFiles.add( ResourceUtils.getWorkspaceRoot().getFileForLocation(targetPath).getLocation().toString() );
>+							}
> 						}
> 					}
> 					
> 					finStream.close();
> 				}
> 			}
>-			javaWSDLParam.setJavaFiles(movedJavaFiles);
>+			javaWSDLParam.setJavaFiles( (String[])movedJavaFiles.toArray( new String[0] ) );
> 			
> 		} catch (Exception e) {
> 			status = StatusUtils.errorStatus(NLS.bind(AxisConsumptionCoreMessages.MSG_ERROR_MOVE_RESOURCE,new String[]{e.getLocalizedMessage()}), e);

Actions: View | Diff

Attachments on bug 225625: 98908