Mercurial > hg > release > icedtea7-forest-2.3 > jdk
changeset 6402:a046c79c8c9a
8022904: Enhance JDBC Parsers
Reviewed-by: alanb, skoivu
author | lancea |
---|---|
date | Thu, 15 Aug 2013 11:46:56 -0400 |
parents | 458e5fe61d94 |
children | 2b5afe7f00cd |
files | src/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java src/share/classes/javax/sql/rowset/spi/SyncFactory.java |
diffstat | 2 files changed, 25 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java Fri Nov 01 10:40:56 2013 +0000 +++ b/src/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java Thu Aug 15 11:46:56 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -659,7 +659,7 @@ //Added the handling for Class tags to take care of maps //Makes an entry into the map upon end of class tag try{ - typeMap.put(Key_map,Class.forName(Value_map)); + typeMap.put(Key_map,sun.reflect.misc.ReflectUtil.forName(Value_map)); }catch(ClassNotFoundException ex) { throw new SAXException(MessageFormat.format(resBundle.handleGetObject("xmlrch.errmap").toString(), ex.getMessage()));
--- a/src/share/classes/javax/sql/rowset/spi/SyncFactory.java Fri Nov 01 10:40:56 2013 +0000 +++ b/src/share/classes/javax/sql/rowset/spi/SyncFactory.java Thu Aug 15 11:46:56 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -35,6 +35,8 @@ import java.io.InputStream; import java.io.IOException; import java.io.FileNotFoundException; +import java.security.AccessController; +import java.security.PrivilegedAction; import javax.naming.*; @@ -362,7 +364,16 @@ /* * Dependent on application */ - String strRowsetProperties = System.getProperty("rowset.properties"); + String strRowsetProperties; + try { + strRowsetProperties = AccessController.doPrivileged(new PrivilegedAction<String>() { + public String run() { + return System.getProperty("rowset.properties"); + } + }); + } catch (Exception ex) { + strRowsetProperties = null; + } if (strRowsetProperties != null) { // Load user's implementation of SyncProvider // here. -Drowset.properties=/abc/def/pqr.txt @@ -407,7 +418,16 @@ * load additional properties from -D command line */ properties.clear(); - String providerImpls = System.getProperty(ROWSET_SYNC_PROVIDER); + String providerImpls; + try { + providerImpls = AccessController.doPrivileged(new PrivilegedAction<String>() { + public String run() { + return System.getProperty(ROWSET_SYNC_PROVIDER); + } + }); + } catch (Exception ex) { + providerImpls = null; + } if (providerImpls != null) { int i = 0;