stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7000752: Duplicate entry in RowSetResourceBundles.properties

Browse Source 
Reviewed-by: alanb
This commit is contained in:
Lance Andersen 2010-11-19 17:15:03 -05:00
parent 76c49b73fc
commit f4f78e456b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle.properties
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -140,7 +140,7 @@ syncrsimpl.valtores = Value to be resolved can either be in the database or in c
#WebRowSetXmlReader exception #WebRowSetXmlReader exception
wrsxmlreader.invalidcp = End of RowSet reached. Invalid cursor position wrsxmlreader.invalidcp = End of RowSet reached. Invalid cursor position
wrsxmlreader.readxml = readXML : {0} wrsxmlreader.readxml = readXML : {0}
wrsxmlreader.parseerr = ** Parsing Error : {0} , line : {0} , uri : {0} wrsxmlreader.parseerr = ** Parsing Error : {0} , line : {1} , uri : {2}
#WebRowSetXmlWriter exceptions #WebRowSetXmlWriter exceptions
wrsxmlwriter.ioex = IOException : {0} wrsxmlwriter.ioex = IOException : {0}
@ -151,7 +151,7 @@ wsrxmlwriter.notproper = Not a proper type
#XmlReaderContentHandler exceptions #XmlReaderContentHandler exceptions
xmlrch.errmap = Error setting Map : {0} xmlrch.errmap = Error setting Map : {0}
xmlrch.errmetadata = Error setting metadata : {0} xmlrch.errmetadata = Error setting metadata : {0}
xmlrch.errinsert = Error inserting values : {0} xmlrch.errinsertval = Error inserting values : {0}
xmlrch.errconstr = Error constructing row : {0} xmlrch.errconstr = Error constructing row : {0}
xmlrch.errdel = Error deleting row : {0} xmlrch.errdel = Error deleting row : {0}
xmlrch.errinsert = Error constructing insert row : {0} xmlrch.errinsert = Error constructing insert row : {0}
@ -161,7 +161,7 @@ xmlrch.errupdrow = Error updating row : {0}
xmlrch.chars = characters : xmlrch.chars = characters :
xmlrch.badvalue = Bad value ; non-nullable property xmlrch.badvalue = Bad value ; non-nullable property
xmlrch.badvalue1 = Bad value ; non-nullable metadata xmlrch.badvalue1 = Bad value ; non-nullable metadata
xmlrch.warning = ** Warning : {0} , line : {0} , uri : {0} xmlrch.warning = ** Warning : {0} , line : {1} , uri : {2}
#RIOptimisticProvider Exceptions #RIOptimisticProvider Exceptions
riop.locking = Locking classification is not supported riop.locking = Locking classification is not supported

2
jdk/src/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java
View File

@ -738,7 +738,7 @@ public class XmlReaderContentHandler extends DefaultHandler {
// columnValue now need to be reset to the empty string // columnValue now need to be reset to the empty string
columnValue = ""; columnValue = "";
} catch (SQLException ex) { } catch (SQLException ex) {
throw new SAXException(MessageFormat.format(resBundle.handleGetObject("xmlrch.errinsert").toString(), ex.getMessage())); throw new SAXException(MessageFormat.format(resBundle.handleGetObject("xmlrch.errinsertval").toString(), ex.getMessage()));
} }
break; break;
case RowTag: case RowTag: