changeset 450:f71197458980 jdk7u4-b13

Merge
author asaha
date Fri, 17 Feb 2012 09:46:18 -0800
parents 067bda21bb61 99c80b7098bd
children 6a262c36caeb
files .hgtags
diffstat 4 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Feb 16 13:01:17 2012 -0800
+++ b/.hgtags	Fri Feb 17 09:46:18 2012 -0800
@@ -141,6 +141,9 @@
 56b02f8ef70391a67c9fa71157a8faafbdff4b74 jdk7u2-b12
 456ff1f14b14ef8cfe47cef95c8094f8443fa092 jdk7u2-b13
 62b846b0c3259cae732e75df50a1b180a2541178 jdk7u2-b21
+1b648adeeefa9b1fb022459e8e4f590b736c0fdd jdk7u3-b02
+730fa05af5a9d10a3a7a1626d248b96d09f8069f jdk7u3-b03
+7f7a9b1addb4925f4f6e17f6eb5cce986c3b626d jdk7u3-b04
 1ba1205119dc3df49bd85360a579fdb895a2fb46 jdk7u4-b200
 de83741c8ba0c01c8ac515daaad3318dd96b57bf jdk7u4-b04
 6dd348fb709145bb005acf8533fd6b5444daaba2 jdk7u4-b02
--- a/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyFactoryImpl.java	Thu Feb 16 13:01:17 2012 -0800
+++ b/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyFactoryImpl.java	Fri Feb 17 09:46:18 2012 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2011, 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
@@ -82,6 +82,6 @@
     private String[] __ids = { "IDL:omg.org/DynamicAny/DynAnyFactory:1.0" };
 
     public String[] _ids() {
-        return __ids;
+        return (String[])__ids.clone();
     }
 }
--- a/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyImpl.java	Thu Feb 16 13:01:17 2012 -0800
+++ b/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyImpl.java	Fri Feb 17 09:46:18 2012 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2011, 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
@@ -195,6 +195,6 @@
     private String[] __ids = { "IDL:omg.org/DynamicAny/DynAny:1.0" };
 
     public String[] _ids() {
-        return __ids;
+        return (String[])__ids.clone();
     }
 }
--- a/src/share/classes/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java	Thu Feb 16 13:01:17 2012 -0800
+++ b/src/share/classes/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java	Fri Feb 17 09:46:18 2012 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2011, 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
@@ -138,7 +138,7 @@
 
     public String[] _ids ()
     {
-        return __ids;
+        return (String[])__ids.clone();
     }