--- a/jdk/src/java.base/share/classes/sun/security/pkcs/ContentInfo.java Mon Jun 29 14:59:20 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/pkcs/ContentInfo.java Mon Jun 29 16:36:44 2015 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2015, 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
@@ -163,9 +163,9 @@
}
public byte[] getData() throws IOException {
- if (contentType.equals((Object)DATA_OID) ||
- contentType.equals((Object)OLD_DATA_OID) ||
- contentType.equals((Object)TIMESTAMP_TOKEN_INFO_OID)) {
+ if (contentType.equals(DATA_OID) ||
+ contentType.equals(OLD_DATA_OID) ||
+ contentType.equals(TIMESTAMP_TOKEN_INFO_OID)) {
if (content == null)
return null;
else