|
From: Dave B. <bla...@us...> - 2012-04-16 12:53:01
|
Update of /cvsroot/sblim/jsr48-client/src/javax/cim
In directory vz-cvs-3.sog:/tmp/cvs-serv27712/src/javax/cim
Modified Files:
CIMObjectPath.java
Log Message:
3513343 - TCK: CIMObjectPath must validate XML schema name
Index: CIMObjectPath.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/CIMObjectPath.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- CIMObjectPath.java 13 Apr 2012 12:19:15 -0000 1.28
+++ CIMObjectPath.java 16 Apr 2012 12:52:59 -0000 1.29
@@ -28,11 +28,14 @@
* 3023141 2010-07-01 blaschke-oss CIMObjectPath uses # constructor instead of valueOf
* 3496349 2012-03-02 blaschke-oss JSR48 1.0.0: add CIMObjectPath getKeyValue
* 3510090 2012-03-23 blaschke-oss Fix CIMObjectPath.toString() inconsistencies
+ * 3513343 2012-03-31 blaschke-oss TCK: CIMObjectPath must validate XML schema name
*/
package javax.cim;
import java.io.Serializable;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.util.Arrays;
import org.sblim.cimclient.internal.cim.CIMElementSorter;
@@ -447,6 +450,13 @@
public CIMObjectPath(String pScheme, String pHost, String pPort, String pNamespace,
String pObjectName, CIMProperty<?>[] pKeys, String pXmlSchemaName) {
this(pScheme, pHost, pPort, pNamespace, pObjectName, pKeys);
+ if (pXmlSchemaName != null) {
+ try {
+ new URL(pXmlSchemaName);
+ } catch (MalformedURLException e) {
+ throw new IllegalArgumentException(e);
+ }
+ }
this.iXmlSchemaName = pXmlSchemaName;
}
|