Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode:[5789] classlib6/core/src/openjdk/com/com/sun
|
From: <ls...@us...> - 2011-02-28 20:05:27
|
Revision: 5789
http://jnode.svn.sourceforge.net/jnode/?rev=5789&view=rev
Author: lsantha
Date: 2011-02-28 20:05:14 +0000 (Mon, 28 Feb 2011)
Log Message:
-----------
Integrating OpenJDK 6 b21.
Modified Paths:
--------------
classlib6/core/src/openjdk/com/com/sun/corba/se/impl/io/IIOPInputStream.java
classlib6/core/src/openjdk/com/com/sun/corba/se/impl/io/ValueHandlerImpl.java
classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orb/PrefixParserAction.java
classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java
classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/ObjectUtility.java
classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/resources/sunorb.properties
classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/resources/sunorb_de.properties
classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/resources/sunorb_es.properties
classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/resources/sunorb_fr.properties
classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/resources/sunorb_it.properties
classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties
classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties
classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/resources/sunorb_sv.properties
classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_CN.properties
classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties
classlib6/core/src/openjdk/com/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java
classlib6/core/src/openjdk/com/com/sun/corba/se/impl/transport/SocketOrChannelAcceptorImpl.java
classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orb/OperationFactory.java
classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orb/ParserImplBase.java
classlib6/core/src/openjdk/com/com/sun/imageio/plugins/bmp/BMPConstants.java
classlib6/core/src/openjdk/com/com/sun/imageio/plugins/bmp/BMPImageReader.java
classlib6/core/src/openjdk/com/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java
classlib6/core/src/openjdk/com/com/sun/imageio/plugins/bmp/BMPImageWriter.java
classlib6/core/src/openjdk/com/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java
classlib6/core/src/openjdk/com/com/sun/imageio/plugins/bmp/BMPMetadata.java
classlib6/core/src/openjdk/com/com/sun/imageio/plugins/bmp/BMPMetadataFormat.java
classlib6/core/src/openjdk/com/com/sun/imageio/plugins/bmp/BMPMetadataFormatResources.java
classlib6/core/src/openjdk/com/com/sun/imageio/plugins/gif/GIFImageMetadata.java
classlib6/core/src/openjdk/com/com/sun/imageio/plugins/gif/GIFImageMetadataFormat.java
classlib6/core/src/openjdk/com/com/sun/imageio/plugins/gif/GIFImageMetadataFormatResources.java
classlib6/core/src/openjdk/com/com/sun/imageio/plugins/gif/GIFImageReader.java
classlib6/core/src/openjdk/com/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java
classlib6/core/src/openjdk/com/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java
classlib6/core/src/openjdk/com/com/sun/imageio/plugins/gif/GIFStreamMetadata.java
classlib6/core/src/openjdk/com/com/sun/imageio/plugins/gif/GIFStreamMetadataFormat.java
classlib6/core/src/openjdk/com/com/sun/imageio/plugins/gif/GIFStreamMetadataFormatResources.java
classlib6/core/src/openjdk/com/com/sun/imageio/plugins/png/PNGImageReader.java
classlib6/core/src/openjdk/com/com/sun/imageio/plugins/png/PNGImageReaderSpi.java
classlib6/core/src/openjdk/com/com/sun/imageio/plugins/png/PNGImageWriter.java
classlib6/core/src/openjdk/com/com/sun/imageio/plugins/png/PNGImageWriterSpi.java
classlib6/core/src/openjdk/com/com/sun/imageio/plugins/png/PNGMetadata.java
classlib6/core/src/openjdk/com/com/sun/imageio/plugins/png/PNGMetadataFormat.java
classlib6/core/src/openjdk/com/com/sun/imageio/plugins/png/PNGMetadataFormatResources.java
classlib6/core/src/openjdk/com/com/sun/imageio/plugins/png/RowFilter.java
classlib6/core/src/openjdk/com/com/sun/imageio/plugins/wbmp/WBMPImageReader.java
classlib6/core/src/openjdk/com/com/sun/imageio/plugins/wbmp/WBMPImageReaderSpi.java
classlib6/core/src/openjdk/com/com/sun/imageio/plugins/wbmp/WBMPImageWriter.java
classlib6/core/src/openjdk/com/com/sun/imageio/plugins/wbmp/WBMPImageWriterSpi.java
classlib6/core/src/openjdk/com/com/sun/imageio/plugins/wbmp/WBMPMetadata.java
classlib6/core/src/openjdk/com/com/sun/imageio/plugins/wbmp/WBMPMetadataFormat.java
classlib6/core/src/openjdk/com/com/sun/imageio/stream/StreamCloser.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifBorders.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifButtonListener.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifButtonUI.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifCheckBoxMenuItemUI.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifComboBoxUI.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifDesktopIconUI.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifDesktopPaneUI.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifEditorPaneUI.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifGraphicsUtils.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifIconFactory.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifInternalFrameTitlePane.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifInternalFrameUI.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifLabelUI.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifMenuBarUI.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifMenuItemUI.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifMenuMouseListener.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifMenuMouseMotionListener.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifMenuUI.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifOptionPaneUI.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifPasswordFieldUI.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifPopupMenuSeparatorUI.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifPopupMenuUI.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifProgressBarUI.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifRadioButtonMenuItemUI.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifRadioButtonUI.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifScrollBarButton.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifScrollBarUI.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifScrollPaneUI.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifSeparatorUI.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifSliderUI.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifSplitPaneDivider.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifSplitPaneUI.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifTabbedPaneUI.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifTextAreaUI.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifTextFieldUI.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifTextPaneUI.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifTextUI.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifToggleButtonUI.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifTreeCellRenderer.java
classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifTreeUI.java
classlib6/core/src/openjdk/com/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java
classlib6/core/src/openjdk/com/com/sun/jmx/remote/internal/ArrayQueue.java
classlib6/core/src/openjdk/com/com/sun/jmx/remote/internal/ClientCommunicatorAdmin.java
classlib6/core/src/openjdk/com/com/sun/jmx/remote/internal/ClientListenerInfo.java
classlib6/core/src/openjdk/com/com/sun/jmx/remote/internal/ClientNotifForwarder.java
classlib6/core/src/openjdk/com/com/sun/jmx/remote/internal/NotificationBuffer.java
classlib6/core/src/openjdk/com/com/sun/jmx/remote/internal/NotificationBufferFilter.java
classlib6/core/src/openjdk/com/com/sun/jmx/remote/internal/ProxyInputStream.java
classlib6/core/src/openjdk/com/com/sun/jmx/remote/internal/ProxyRef.java
classlib6/core/src/openjdk/com/com/sun/jmx/remote/internal/RMIExporter.java
classlib6/core/src/openjdk/com/com/sun/jmx/remote/internal/ServerCommunicatorAdmin.java
classlib6/core/src/openjdk/com/com/sun/jmx/remote/internal/ServerNotifForwarder.java
classlib6/core/src/openjdk/com/com/sun/jmx/remote/internal/Unmarshal.java
classlib6/core/src/openjdk/com/com/sun/jmx/remote/internal/package.html
classlib6/core/src/openjdk/com/com/sun/jmx/remote/security/FileLoginModule.java
classlib6/core/src/openjdk/com/com/sun/jmx/remote/security/JMXPluggableAuthenticator.java
classlib6/core/src/openjdk/com/com/sun/jmx/remote/security/JMXSubjectDomainCombiner.java
classlib6/core/src/openjdk/com/com/sun/jmx/remote/security/MBeanServerAccessController.java
classlib6/core/src/openjdk/com/com/sun/jmx/remote/security/MBeanServerFileAccessController.java
classlib6/core/src/openjdk/com/com/sun/jmx/remote/security/SubjectDelegator.java
classlib6/core/src/openjdk/com/com/sun/jndi/dns/DnsContextFactory.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/BasicControl.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/Ber.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/BerDecoder.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/BerEncoder.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/BindingWithControls.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/ClientId.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/Connection.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/DefaultResponseControlFactory.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/DigestClientId.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/EntryChangeResponseControl.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/EventQueue.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/EventSupport.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/Filter.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapAttribute.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapBindingEnumeration.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapClient.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapClientFactory.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapCtx.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapCtxFactory.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapEntry.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapName.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapNameParser.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapNamingEnumeration.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapPoolManager.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapReferralContext.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapReferralException.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapRequest.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapResult.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapSchemaCtx.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapSchemaParser.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapSearchEnumeration.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapURL.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/ManageReferralControl.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/NameClassPairWithControls.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/NamingEventNotifier.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/NotifierArgs.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/Obj.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/PersistentSearchControl.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/ReferralEnumeration.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/SearchResultWithControls.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/ServiceLocator.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/SimpleClientId.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/UnsolicitedResponseImpl.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/VersionHelper.java
classlib6/core/src/openjdk/com/com/sun/jndi/ldap/VersionHelper12.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/lib/ObjectFactory.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xslt/ObjectFactory.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/TransletException.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/cmdline/Compile.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/cmdline/ObjectFactory.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterExpr.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/ObjectFactory.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentLocationPath.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/QName.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/Step.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectFactory.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/dom/NodeCounter.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/dom/ObjectFactory.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/dom/SingleNodeCounter.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/runtime/ObjectFactory.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/runtime/StringValueHandler.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/trax/ObjectFactory.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/dom/AttrImpl.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/dom/NodeListCache.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/dom/PSVIElementNSImpl.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/dom/ParentNode.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/Constants.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/PropertyManager.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/XMLScanner.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDProcessor.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/dv/ValidationContext.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages.properties
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages.properties
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/validation/ValidationState.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMUniOp.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMParser.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDComplexTypeTraverser.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/parsers/DOMParser.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/parsers/SAXParser.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/parsers/XMLParser.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/util/NamespaceContextWrapper.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/util/SymbolTable.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/util/XMLAttributesImpl.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/xni/QName.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/xni/parser/XMLConfigurationException.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/xpointer/ElementSchemePointer.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/dtm/ObjectFactory.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseIterators.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/dtm/ref/ObjectFactory.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/resolver/Catalog.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/resolver/helpers/FileURL.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/security/algorithms/implementations/IntegrityHmac.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/serializer/CharInfo.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/serializer/EncodingInfo.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/serializer/Encodings.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/serializer/Encodings.properties
classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/serializer/NamespaceMappings.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/serializer/ObjectFactory.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/utils/ObjectFactory.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/axes/NodeSequence.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/compiler/ObjectFactory.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/domapi/XPathStylesheetDOM3Exception.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/functions/ObjectFactory.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/objects/XBoolean.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/objects/XNodeSet.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/objects/XNodeSetForDOM.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/objects/XNumber.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/objects/XObject.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/objects/XRTreeFrag.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_fr.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java
classlib6/core/src/openjdk/com/com/sun/rowset/RowSetResourceBundle.properties
classlib6/core/src/openjdk/com/com/sun/rowset/RowSetResourceBundle_de.properties
classlib6/core/src/openjdk/com/com/sun/rowset/RowSetResourceBundle_es.properties
classlib6/core/src/openjdk/com/com/sun/rowset/RowSetResourceBundle_fr.properties
classlib6/core/src/openjdk/com/com/sun/rowset/RowSetResourceBundle_it.properties
classlib6/core/src/openjdk/com/com/sun/rowset/RowSetResourceBundle_ja.properties
classlib6/core/src/openjdk/com/com/sun/rowset/RowSetResourceBundle_ko.properties
classlib6/core/src/openjdk/com/com/sun/rowset/RowSetResourceBundle_sv.properties
classlib6/core/src/openjdk/com/com/sun/rowset/RowSetResourceBundle_zh_CN.properties
classlib6/core/src/openjdk/com/com/sun/rowset/RowSetResourceBundle_zh_TW.properties
classlib6/core/src/openjdk/com/com/sun/rowset/internal/BaseRow.java
classlib6/core/src/openjdk/com/com/sun/rowset/internal/CachedRowSetReader.java
classlib6/core/src/openjdk/com/com/sun/rowset/internal/CachedRowSetWriter.java
classlib6/core/src/openjdk/com/com/sun/rowset/internal/InsertRow.java
classlib6/core/src/openjdk/com/com/sun/rowset/internal/Row.java
classlib6/core/src/openjdk/com/com/sun/rowset/internal/SyncResolverImpl.java
classlib6/core/src/openjdk/com/com/sun/rowset/internal/WebRowSetXmlReader.java
classlib6/core/src/openjdk/com/com/sun/rowset/internal/WebRowSetXmlWriter.java
classlib6/core/src/openjdk/com/com/sun/rowset/internal/XmlErrorHandler.java
classlib6/core/src/openjdk/com/com/sun/rowset/internal/XmlReaderContentHandler.java
classlib6/core/src/openjdk/com/com/sun/rowset/internal/XmlResolver.java
classlib6/core/src/openjdk/com/com/sun/security/sasl/util/AbstractSaslImpl.java
classlib6/core/src/openjdk/com/com/sun/security/sasl/util/PolicyUtils.java
classlib6/core/src/openjdk/com/com/sun/tools/corba/se/idl/constExpr/Expression.java
Added Paths:
-----------
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/dtd/BalancedDTDGrammar.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xpath/regex/CaseInsensitiveMap.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMRepeatingLeaf.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java
Removed Paths:
-------------
classlib6/core/src/openjdk/com/com/sun/corba/se/internal/io/
classlib6/core/src/openjdk/com/com/sun/jmx/remote/util/Service.java
classlib6/core/src/openjdk/com/com/sun/org/apache/regexp/internal/REDemo.java
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/client/
classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/runtime/AttributeList.java
Modified: classlib6/core/src/openjdk/com/com/sun/corba/se/impl/io/IIOPInputStream.java
===================================================================
--- classlib6/core/src/openjdk/com/com/sun/corba/se/impl/io/IIOPInputStream.java 2011-02-26 21:36:44 UTC (rev 5788)
+++ classlib6/core/src/openjdk/com/com/sun/corba/se/impl/io/IIOPInputStream.java 2011-02-28 20:05:14 UTC (rev 5789)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
@@ -2553,8 +2553,8 @@
bridge.putObject( o, key, v ) ;
} catch (Exception e) {
throw utilWrapper.errorSetObjectField( e, fieldName,
- ObjectUtility.compactObjectToString( o ),
- ObjectUtility.compactObjectToString( v )) ;
+ o.toString(),
+ v.toString() ) ;
}
}
@@ -2566,7 +2566,7 @@
bridge.putBoolean( o, key, v ) ;
} catch (Exception e) {
throw utilWrapper.errorSetBooleanField( e, fieldName,
- ObjectUtility.compactObjectToString( o ),
+ o.toString(),
new Boolean(v) ) ;
}
}
@@ -2579,7 +2579,7 @@
bridge.putByte( o, key, v ) ;
} catch (Exception e) {
throw utilWrapper.errorSetByteField( e, fieldName,
- ObjectUtility.compactObjectToString( o ),
+ o.toString(),
new Byte(v) ) ;
}
}
@@ -2592,7 +2592,7 @@
bridge.putChar( o, key, v ) ;
} catch (Exception e) {
throw utilWrapper.errorSetCharField( e, fieldName,
- ObjectUtility.compactObjectToString( o ),
+ o.toString(),
new Character(v) ) ;
}
}
@@ -2605,7 +2605,7 @@
bridge.putShort( o, key, v ) ;
} catch (Exception e) {
throw utilWrapper.errorSetShortField( e, fieldName,
- ObjectUtility.compactObjectToString( o ),
+ o.toString(),
new Short(v) ) ;
}
}
@@ -2618,7 +2618,7 @@
bridge.putInt( o, key, v ) ;
} catch (Exception e) {
throw utilWrapper.errorSetIntField( e, fieldName,
- ObjectUtility.compactObjectToString( o ),
+ o.toString(),
new Integer(v) ) ;
}
}
@@ -2631,7 +2631,7 @@
bridge.putLong( o, key, v ) ;
} catch (Exception e) {
throw utilWrapper.errorSetLongField( e, fieldName,
- ObjectUtility.compactObjectToString( o ),
+ o.toString(),
new Long(v) ) ;
}
}
@@ -2644,7 +2644,7 @@
bridge.putFloat( o, key, v ) ;
} catch (Exception e) {
throw utilWrapper.errorSetFloatField( e, fieldName,
- ObjectUtility.compactObjectToString( o ),
+ o.toString(),
new Float(v) ) ;
}
}
@@ -2657,7 +2657,7 @@
bridge.putDouble( o, key, v ) ;
} catch (Exception e) {
throw utilWrapper.errorSetDoubleField( e, fieldName,
- ObjectUtility.compactObjectToString( o ),
+ o.toString(),
new Double(v) ) ;
}
}
Modified: classlib6/core/src/openjdk/com/com/sun/corba/se/impl/io/ValueHandlerImpl.java
===================================================================
--- classlib6/core/src/openjdk/com/com/sun/corba/se/impl/io/ValueHandlerImpl.java 2011-02-26 21:36:44 UTC (rev 5788)
+++ classlib6/core/src/openjdk/com/com/sun/corba/se/impl/io/ValueHandlerImpl.java 2011-02-28 20:05:14 UTC (rev 5789)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
@@ -32,32 +32,22 @@
package com.sun.corba.se.impl.io;
import javax.rmi.CORBA.Util;
-import javax.rmi.PortableRemoteObject;
import java.util.Hashtable;
-import java.util.Stack;
import java.io.IOException;
-import java.util.EmptyStackException;
-import com.sun.corba.se.impl.util.Utility;
-import com.sun.corba.se.impl.io.IIOPInputStream;
-import com.sun.corba.se.impl.io.IIOPOutputStream;
import com.sun.corba.se.impl.util.RepositoryId;
import com.sun.corba.se.impl.util.Utility;
import org.omg.CORBA.TCKind;
-import org.omg.CORBA.MARSHAL;
-import org.omg.CORBA.BAD_PARAM;
-import org.omg.CORBA.CompletionStatus;
import org.omg.CORBA.portable.IndirectionException;
import com.sun.org.omg.SendingContext.CodeBase;
import com.sun.org.omg.SendingContext.CodeBaseHelper;
import java.security.AccessController;
import java.security.PrivilegedAction;
-
-import com.sun.corba.se.impl.io.IIOPInputStream.ActiveRecursionManager;
+import java.security.PrivilegedExceptionAction;
import com.sun.corba.se.spi.logging.CORBALogDomains;
import com.sun.corba.se.impl.logging.OMGSystemException;
@@ -809,46 +799,149 @@
return "com.sun.corba.se.impl.io.IIOPOutputStream";
}
- private com.sun.corba.se.impl.io.IIOPOutputStream createOutputStream() {
- return (com.sun.corba.se.impl.io.IIOPOutputStream)AccessController.doPrivileged(
- new StreamFactory(getOutputStreamClassName()));
+ private IIOPOutputStream createOutputStream() {
+ final String name = getOutputStreamClassName();
+ try {
+ IIOPOutputStream stream = createOutputStreamBuiltIn(name);
+ if (stream != null) {
+ return stream;
+ }
+ return createCustom(IIOPOutputStream.class, name);
+ } catch (Throwable t) {
+ // Throw exception under the carpet.
+ InternalError ie = new InternalError(
+ "Error loading " + name
+ );
+ ie.initCause(t);
+ throw ie;
+ }
}
+ /**
+ * Construct a built in implementation with priveleges.
+ * Returning null indicates a non-built is specified.
+ */
+ private IIOPOutputStream createOutputStreamBuiltIn(
+ final String name
+ ) throws Throwable {
+ try {
+ return AccessController.doPrivileged(
+ new PrivilegedExceptionAction<IIOPOutputStream>() {
+ public IIOPOutputStream run() throws IOException {
+ return createOutputStreamBuiltInNoPriv(name);
+ }
+ }
+ );
+ } catch (java.security.PrivilegedActionException exc) {
+ throw exc.getCause();
+ }
+ }
+
+ /**
+ * Returning null indicates a non-built is specified.
+ */
+ private IIOPOutputStream createOutputStreamBuiltInNoPriv(
+ final String name
+ ) throws IOException {
+ return
+ name.equals(
+ IIOPOutputStream
+ .class.getName()
+ ) ?
+ new IIOPOutputStream() :
+
+ name.equals(
+ com.sun.corba.se.impl.orbutil.IIOPOutputStream_1_3
+ .class.getName()
+ ) ?
+ new com.sun.corba.se.impl.orbutil.IIOPOutputStream_1_3() :
+
+ name.equals(
+ com.sun.corba.se.impl.orbutil.IIOPOutputStream_1_3_1
+ .class.getName()
+ ) ?
+ new com.sun.corba.se.impl.orbutil.IIOPOutputStream_1_3_1() :
+
+ null;
+ }
+
protected String getInputStreamClassName() {
return "com.sun.corba.se.impl.io.IIOPInputStream";
}
- private com.sun.corba.se.impl.io.IIOPInputStream createInputStream() {
- return (com.sun.corba.se.impl.io.IIOPInputStream)AccessController.doPrivileged(
- new StreamFactory(getInputStreamClassName()));
+ private IIOPInputStream createInputStream() {
+ final String name = getInputStreamClassName();
+ try {
+ IIOPInputStream stream = createInputStreamBuiltIn(name);
+ if (stream != null) {
+ return stream;
+ }
+ return createCustom(IIOPInputStream.class, name);
+ } catch (Throwable t) {
+ // Throw exception under the carpet.
+ InternalError ie = new InternalError(
+ "Error loading " + name
+ );
+ ie.initCause(t);
+ throw ie;
+ }
}
/**
- * Instantiates a class of the given name using the system ClassLoader
- * as part of a PrivilegedAction.
- *
- * It's private final so hopefully people can't grab it outside of
- * this class.
- *
- * If you're worried that someone could subclass ValueHandlerImpl,
- * install his own streams, and snoop what's on the wire:
- * Someone can do that only if he's allowed to use the feature
- * of installing his own javax.rmi.CORBA.Util delegate (via a
- * JVM property or orb.properties file, read the first time the
- * Util class is used). If he can do that, he can snoop
- * anything on the wire, anyway, without abusing the
- * StreamFactory class.
+ * Construct a built in implementation with priveleges.
+ * Returning null indicates a non-built is specified.
*/
- private static final class StreamFactory implements PrivilegedAction {
- private String className;
+ private IIOPInputStream createInputStreamBuiltIn(
+ final String name
+ ) throws Throwable {
+ try {
+ return AccessController.doPrivileged(
+ new PrivilegedExceptionAction<IIOPInputStream>() {
+ public IIOPInputStream run() throws IOException {
+ return createInputStreamBuiltInNoPriv(name);
+ }
+ }
+ );
+ } catch (java.security.PrivilegedActionException exc) {
+ throw exc.getCause();
+ }
+ }
+
+ /**
+ * Returning null indicates a non-built is specified.
+ */
+ private IIOPInputStream createInputStreamBuiltInNoPriv(
+ final String name
+ ) throws IOException {
+ return
+ name.equals(
+ IIOPInputStream
+ .class.getName()
+ ) ?
+ new IIOPInputStream() :
+
+ name.equals(
+ com.sun.corba.se.impl.orbutil.IIOPInputStream_1_3
+ .class.getName()
+ ) ?
+ new com.sun.corba.se.impl.orbutil.IIOPInputStream_1_3() :
+
+ name.equals(
+ com.sun.corba.se.impl.orbutil.IIOPInputStream_1_3_1
+ .class.getName()
+ ) ?
+ new com.sun.corba.se.impl.orbutil.IIOPInputStream_1_3_1() :
- public StreamFactory (String _className) {
- className = _className;
+ null;
}
- public Object run() {
- try {
- // Note: We must use the system ClassLoader here
+ /**
+ * Create a custom implementation without privileges.
+ */
+ private <T> T createCustom(
+ final Class<T> type, final String className
+ ) throws Throwable {
+ // Note: We use the thread context or system ClassLoader here
// since we want to load classes outside of the
// core JDK when running J2EE Pure ORB and
// talking to Kestrel.
@@ -856,18 +949,13 @@
if (cl == null)
cl = ClassLoader.getSystemClassLoader();
- Class streamClass = cl.loadClass(className);
+ Class<?> clazz = cl.loadClass(className);
+ Class<? extends T> streamClass = clazz.asSubclass(type);
// Since the ClassLoader should cache the class, this isn't
// as expensive as it looks.
return streamClass.newInstance();
- } catch(Throwable t) {
- InternalError ie = new InternalError( "Error loading " + className ) ;
- ie.initCause( t ) ;
- throw ie ;
- }
- }
}
/**
Modified: classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orb/PrefixParserAction.java
===================================================================
--- classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orb/PrefixParserAction.java 2011-02-26 21:36:44 UTC (rev 5788)
+++ classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orb/PrefixParserAction.java 2011-02-28 20:05:14 UTC (rev 5789)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
@@ -110,7 +110,7 @@
throw wrapper.couldNotSetArray( thr,
getPropertyName(), new Integer(ctr),
componentType, new Integer(size),
- ObjectUtility.compactObjectToString( obj )) ;
+ obj.toString() ) ;
}
ctr++ ;
}
Modified: classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java
===================================================================
--- classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java 2011-02-26 21:36:44 UTC (rev 5788)
+++ classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java 2011-02-28 20:05:14 UTC (rev 5789)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2010, 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
Modified: classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/ObjectUtility.java
===================================================================
--- classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/ObjectUtility.java 2011-02-26 21:36:44 UTC (rev 5788)
+++ classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/ObjectUtility.java 2011-02-28 20:05:14 UTC (rev 5789)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, 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
@@ -50,104 +50,9 @@
import java.math.BigDecimal ;
public final class ObjectUtility {
- private boolean useToString ;
- private boolean isIndenting ;
- private int initialLevel ;
- private int increment ;
- private ClassMap classToPrinter = new ClassMap() ;
+ private ObjectUtility() {}
- private static ObjectUtility standard = new ObjectUtility( false, true,
- 0, 4 ) ;
- private static ObjectUtility compact = new ObjectUtility( true, false,
- 0, 4 ) ;
- private ObjectUtility( boolean useToString, boolean isIndenting,
- int initialLevel, int increment )
- {
- this.useToString = useToString ;
- this.isIndenting = isIndenting ;
- this.initialLevel = initialLevel ;
- this.increment = increment ;
- classToPrinter.put( Properties.class, propertiesPrinter ) ;
- classToPrinter.put( Collection.class, collectionPrinter ) ;
- classToPrinter.put( Map.class, mapPrinter ) ;
- }
-
- /** Construct an Utility instance with the desired objectToString
- * behavior.
- */
- public static ObjectUtility make( boolean useToString, boolean isIndenting,
- int initialLevel, int increment )
- {
- return new ObjectUtility( useToString, isIndenting, initialLevel,
- increment ) ;
- }
-
- /** Construct an Utility instance with the desired objectToString
- * behavior.
- */
- public static ObjectUtility make( boolean useToString, boolean isIndenting )
- {
- return new ObjectUtility( useToString, isIndenting, 0, 4 ) ;
- }
-
- /** Get the standard Utility object that supports objectToString with
- * indented display and no use of toString() methods.
- */
- public static ObjectUtility make()
- {
- return standard ;
- }
-
- /** A convenience method that gives the default behavior: use indenting
- * to display the object's structure and do not use built-in toString
- * methods.
- */
- public static String defaultObjectToString( java.lang.Object object )
- {
- return standard.objectToString( object ) ;
- }
-
- public static String compactObjectToString( java.lang.Object object )
- {
- return compact.objectToString( object ) ;
- }
-
- /** objectToString handles display of arbitrary objects. It correctly
- * handles objects whose elements form an arbitrary graph. It uses
- * reflection to display the contents of any kind of object.
- * An object's toString() method may optionally be used, but the default
- * is to ignore all toString() methods except for those defined for
- * primitive types, primitive type wrappers, and strings.
- */
- public String objectToString(java.lang.Object obj)
- {
- IdentityHashMap printed = new IdentityHashMap() ;
- ObjectWriter result = ObjectWriter.make( isIndenting, initialLevel,
- increment ) ;
- objectToStringHelper( printed, result, obj ) ;
- return result.toString() ;
- }
-
- // Perform a deep structural equality comparison of the two objects.
- // This handles all arrays, maps, and sets specially, otherwise
- // it just calls the object's equals() method.
- public static boolean equals( java.lang.Object obj1, java.lang.Object obj2 )
- {
- // Set of pairs of objects that have been (or are being) considered for
- // equality. Such pairs are presumed to be equals. If they are not,
- // this will be detected eventually and the equals method will return
- // false.
- Set considered = new HashSet() ;
-
- // Map that gives the corresponding component of obj2 for a component
- // of obj1. This is used to check for the same aliasing and use of
- // equal objects in both objects.
- Map counterpart = new IdentityHashMap() ;
-
- return equalsHelper( counterpart, considered, obj1, obj2 ) ;
- }
-
/** If arr1 and arr2 are both arrays of the same component type,
* return an array of that component type that consists of the
* elements of arr1 followed by the elements of arr2.
@@ -179,544 +84,4 @@
return result ;
}
-//===========================================================================
-// Implementation
-//===========================================================================
-
- private void objectToStringHelper( IdentityHashMap printed,
- ObjectWriter result, java.lang.Object obj)
- {
- if (obj==null) {
- result.append( "null" ) ;
- result.endElement() ;
- } else {
- Class cls = obj.getClass() ;
- result.startObject( obj ) ;
-
- if (printed.keySet().contains( obj )) {
- result.endObject( "*VISITED*" ) ;
- } else {
- printed.put( obj, null ) ;
-
- if (mustUseToString(cls)) {
- result.endObject( obj.toString() ) ;
- } else {
- // First, handle any classes that have special printer
- // methods defined. This is useful when the class
- // overrides toString with something that
- // is not sufficiently detailed.
- ObjectPrinter printer = (ObjectPrinter)(classToPrinter.get(
- cls )) ;
- if (printer != null) {
- printer.print( printed, result, obj ) ;
- result.endObject() ;
- } else {
- Class compClass = cls.getComponentType() ;
-
- if (compClass == null)
- // handleObject always calls endObject
- handleObject( printed, result, obj ) ;
- else {
- handleArray( printed, result, obj ) ;
- result.endObject() ;
- }
- }
- }
- }
- }
- }
-
- private static interface ObjectPrinter {
- void print( IdentityHashMap printed, ObjectWriter buff,
- java.lang.Object obj ) ;
- }
-
- private ObjectPrinter propertiesPrinter = new ObjectPrinter() {
- public void print( IdentityHashMap printed, ObjectWriter buff,
- java.lang.Object obj )
- {
- if (!(obj instanceof Properties))
- throw new Error() ;
-
- Properties props = (Properties)obj ;
- Enumeration keys = props.propertyNames() ;
- while (keys.hasMoreElements()) {
- String key = (String)(keys.nextElement()) ;
- String value = props.getProperty( key ) ;
- buff.startElement() ;
- buff.append( key ) ;
- buff.append( "=" ) ;
- buff.append( value ) ;
- buff.endElement() ;
- }
- }
- } ;
-
- private ObjectPrinter collectionPrinter = new ObjectPrinter() {
- public void print( IdentityHashMap printed, ObjectWriter buff,
- java.lang.Object obj )
- {
- if (!(obj instanceof Collection))
- throw new Error() ;
-
- Collection coll = (Collection)obj ;
- Iterator iter = coll.iterator() ;
- while (iter.hasNext()) {
- java.lang.Object element = iter.next() ;
- buff.startElement() ;
- objectToStringHelper( printed, buff, element ) ;
- buff.endElement() ;
- }
- }
- } ;
-
- private ObjectPrinter mapPrinter = new ObjectPrinter() {
- public void print( IdentityHashMap printed, ObjectWriter buff,
- java.lang.Object obj )
- {
- if (!(obj instanceof Map))
- throw new Error() ;
-
- Map map = (Map)obj ;
- Iterator iter = map.entrySet().iterator() ;
- while (iter.hasNext()) {
- Entry entry = (Entry)(iter.next()) ;
- buff.startElement() ;
- objectToStringHelper( printed, buff, entry.getKey() ) ;
- buff.append( "=>" ) ;
- objectToStringHelper( printed, buff, entry.getValue() ) ;
- buff.endElement() ;
- }
- }
- } ;
-
- private static class ClassMap {
- ArrayList data ;
-
- public ClassMap()
- {
- data = new ArrayList() ;
- }
-
- /** Return the first element of the ClassMap that is assignable to cls.
- * The order is determined by the order in which the put method was
- * called. Returns null if there is no match.
- */
- public java.lang.Object get( Class cls )
- {
- Iterator iter = data.iterator() ;
- while (iter.hasNext()) {
- java.lang.Object[] arr = (java.lang.Object[])(iter.next()) ;
- Class key = (Class)(arr[0]) ;
- if (key.isAssignableFrom( cls ))
- return arr[1] ;
- }
-
- return null ;
- }
-
- /** Add obj to the map with key cls. Note that order matters,
- * as the first match is returned.
- */
- public void put( Class cls, java.lang.Object obj )
- {
- java.lang.Object[] pair = { cls, obj } ;
- data.add( pair ) ;
- }
- }
-
- private boolean mustUseToString( Class cls )
- {
- // These probably never occur
- if (cls.isPrimitive())
- return true ;
-
- // We must use toString for all primitive wrappers, since
- // otherwise the code recurses endlessly (access value field
- // inside Integer, returns another Integer through reflection).
- if ((cls == Integer.class) ||
- (cls == BigInteger.class) ||
- (cls == BigDecimal.class) ||
- (cls == String.class) ||
- (cls == StringBuffer.class) ||
- (cls == Long.class) ||
- (cls == Short.class) ||
- (cls == Byte.class) ||
- (cls == Character.class) ||
- (cls == Float.class) ||
- (cls == Double.class) ||
- (cls == Boolean.class))
- return true ;
-
- if (useToString) {
- try {
- cls.getDeclaredMethod( "toString", (Class[])null ) ;
- return true ;
- } catch (Exception exc) {
- return false ;
- }
- }
-
- return false ;
- }
-
- private void handleObject( IdentityHashMap printed, ObjectWriter result,
- java.lang.Object obj )
- {
- Class cls = obj.getClass() ;
-
- try {
- Field[] fields;
- SecurityManager security = System.getSecurityManager();
- if (security != null && !Modifier.isPublic(cls.getModifiers())) {
- fields = new Field[0];
- } else {
- fields = cls.getDeclaredFields();
- }
-
- for (int ctr=0; ctr<fields.length; ctr++ ) {
- final Field fld = fields[ctr] ;
- int modifiers = fld.getModifiers() ;
-
- // Do not display field if it is static, since these fields
- // are always the same for every instances. This could
- // be made configurable, but I don't think it is
- // useful to do so.
- if (!Modifier.isStatic( modifiers )) {
- if (security != null) {
- if (!Modifier.isPublic(modifiers))
- continue;
- }
- result.startElement() ;
- result.append( fld.getName() ) ;
- result.append( ":" ) ;
-
- try {
- // Make sure that we can read the field if it is
- // not public
- AccessController.doPrivileged( new PrivilegedAction() {
- public Object run() {
- fld.setAccessible( true ) ;
- return null ;
- }
- } ) ;
-
- java.lang.Object value = fld.get( obj ) ;
- objectToStringHelper( printed, result, value ) ;
- } catch (Exception exc2) {
- result.append( "???" ) ;
- }
-
- result.endElement() ;
- }
- }
-
- result.endObject() ;
- } catch (Exception exc2) {
- result.endObject( obj.toString() ) ;
- }
- }
-
- private void handleArray( IdentityHashMap printed, ObjectWriter result,
- java.lang.Object obj )
- {
- Class compClass = obj.getClass().getComponentType() ;
- if (compClass == boolean.class) {
- boolean[] arr = (boolean[])obj ;
- for (int ctr=0; ctr<arr.length; ctr++) {
- result.startElement() ;
- result.append( arr[ctr] ) ;
- result.endElement() ;
- }
- } else if (compClass == byte.class) {
- byte[] arr = (byte[])obj ;
- for (int ctr=0; ctr<arr.length; ctr++) {
- result.startElement() ;
- result.append( arr[ctr] ) ;
- result.endElement() ;
- }
- } else if (compClass == short.class) {
- short[] arr = (short[])obj ;
- for (int ctr=0; ctr<arr.length; ctr++) {
- result.startElement() ;
- result.append( arr[ctr] ) ;
- result.endElement() ;
- }
- } else if (compClass == int.class) {
- int[] arr = (int[])obj ;
- for (int ctr=0; ctr<arr.length; ctr++) {
- result.startElement() ;
- result.append( arr[ctr] ) ;
- result.endElement() ;
- }
- } else if (compClass == long.class) {
- long[] arr = (long[])obj ;
- for (int ctr=0; ctr<arr.length; ctr++) {
- result.startElement() ;
- result.append( arr[ctr] ) ;
- result.endElement() ;
- }
- } else if (compClass == char.class) {
- char[] arr = (char[])obj ;
- for (int ctr=0; ctr<arr.length; ctr++) {
- result.startElement() ;
- result.append( arr[ctr] ) ;
- result.endElement() ;
- }
- } else if (compClass == float.class) {
- float[] arr = (float[])obj ;
- for (int ctr=0; ctr<arr.length; ctr++) {
- result.startElement() ;
- result.append( arr[ctr] ) ;
- result.endElement() ;
- }
- } else if (compClass == double.class) {
- double[] arr = (double[])obj ;
- for (int ctr=0; ctr<arr.length; ctr++) {
- result.startElement() ;
- result.append( arr[ctr] ) ;
- result.endElement() ;
- }
- } else { // array of object
- java.lang.Object[] arr = (java.lang.Object[])obj ;
- for (int ctr=0; ctr<arr.length; ctr++) {
- result.startElement() ;
- objectToStringHelper( printed, result, arr[ctr] ) ;
- result.endElement() ;
- }
- }
- }
-
- private static class Pair
- {
- private java.lang.Object obj1 ;
- private java.lang.Object obj2 ;
-
- Pair( java.lang.Object obj1, java.lang.Object obj2 )
- {
- this.obj1 = obj1 ;
- this.obj2 = obj2 ;
- }
-
- public boolean equals( java.lang.Object obj )
- {
- if (!(obj instanceof Pair))
- return false ;
-
- Pair other = (Pair)obj ;
- return other.obj1 == obj1 && other.obj2 == obj2 ;
- }
-
- public int hashCode()
- {
- return System.identityHashCode( obj1 ) ^
- System.identityHashCode( obj2 ) ;
- }
- }
-
- private static boolean equalsHelper( Map counterpart, Set considered,
- java.lang.Object obj1, java.lang.Object obj2 )
- {
- if ((obj1 == null) || (obj2 == null))
- return obj1 == obj2 ;
-
- java.lang.Object other2 = counterpart.get( obj1 ) ;
- if (other2 == null) {
- other2 = obj2 ;
- counterpart.put( obj1, other2 ) ;
- }
-
- if (obj1 == other2)
- return true ;
-
- if (obj2 != other2)
- return false ;
-
- Pair pair = new Pair( obj1, obj2 ) ;
- if (considered.contains( pair ))
- return true ;
- else
- considered.add( pair ) ;
-
- if (obj1 instanceof java.lang.Object...
[truncated message content] |
