Author: scabanovich Date: 2010-07-16 09:46:47 -0400 (Fri, 16 Jul 2010) New Revision: 23499 Modified: branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/EncodedProperties.java branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/PropertiesLoader.java Log: https://jira.jboss.org/browse/JBIDE-6555 Modified: branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/EncodedProperties.java =================================================================== --- branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/EncodedProperties.java 2010-07-16 13:41:48 UTC (rev 23498) +++ branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/EncodedProperties.java 2010-07-16 13:46:47 UTC (rev 23499) @@ -100,9 +100,13 @@ } valueStart++; } + try { String key = loadConvert(lr.lineBuf, 0, keyLen, convtBuf); String value = loadConvert(lr.lineBuf, valueStart, limit - valueStart, convtBuf); put(key, value); + } catch (IllegalArgumentException e) { + //TODO create object for error marker + } } } @@ -272,6 +276,7 @@ value = (value << 4) + 10 + aChar - 'A'; break; default: + //TODO create object for error marker throw new IllegalArgumentException( "Malformed \\uxxxx encoding."); //$NON-NLS-1$ } @@ -403,4 +408,4 @@ p.list(System.out); } -} +} \ No newline at end of file Modified: branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/PropertiesLoader.java =================================================================== --- branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/PropertiesLoader.java 2010-07-16 13:41:48 UTC (rev 23498) +++ branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/PropertiesLoader.java 2010-07-16 13:46:47 UTC (rev 23499) @@ -269,6 +269,8 @@ p.load(sr); } catch (IOException e) { //ignore + } catch (IllegalArgumentException e1) { + return null; } return p.getProperty("a"); } @@ -357,4 +359,4 @@ return s.length(); } -} +} \ No newline at end of file