[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[tm-cvs-commit] dmcknight org.eclipse.tm.rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence PropertyFileProvider.java

Update of /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence
In directory dev2:/tmp/cvs-serv5852/src/org/eclipse/rse/internal/persistence

Modified Files:
      Tag: R3_2_maintenance
	PropertyFileProvider.java 
Log Message:
[376738] PropertyFileProvider should catch exceptions in care a written profile was corrupted


Index: PropertyFileProvider.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/PropertyFileProvider.java,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -d -r1.12 -r1.12.2.1
*** PropertyFileProvider.java	29 Oct 2008 17:18:04 -0000	1.12
--- PropertyFileProvider.java	15 May 2012 16:35:37 -0000	1.12.2.1
***************
*** 1,4 ****
  /********************************************************************************
!  * Copyright (c) 2006, 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 
--- 1,4 ----
  /********************************************************************************
!  * Copyright (c) 2006, 2012 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 
***************
*** 17,20 ****
--- 17,21 ----
   * David Dykstal (IBM) - [225988] need API to mark persisted profiles as migrated
   * David Dykstal (IBM) - [252357] made nested property sets and properties embedded nodes in the persistent form
+  * David McKnight (IBM)- [376738] PropertyFileProvider should catch exceptions in care a written profile was corrupted
   ********************************************************************************/
  package org.eclipse.rse.internal.persistence;
***************
*** 796,800 ****
  			String childName = (String) z.next();
  			Properties p = getProperties(childPropertiesMap, childName);
! 			makeNode(node, location, p, monitor);
  		}
  		for (Iterator z = referenceKeys.iterator(); z.hasNext();) {
--- 797,807 ----
  			String childName = (String) z.next();
  			Properties p = getProperties(childPropertiesMap, childName);
! 			try {
! 				makeNode(node, location, p, monitor);
! 			}
! 			catch (Exception e){
! 				// minimize impact of unexpected exception
! 				logException(e);
! 			}
  		}
  		for (Iterator z = referenceKeys.iterator(); z.hasNext();) {