Merge

84e796a9 · robm · 6400dfa9 · c6938578 · 84e796a9 · 84e796a9
Showing with 2 addition and 2 deletion

src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp +1 -1

test/gc/TestSoftReferencesBehaviorOnOOME.java test/gc/TestSoftReferencesBehaviorOnOOME.java +1 -1

未找到文件。
--- a/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp
+++ b/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp
 /*
- * Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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

--- a/test/gc/TestSoftReferencesBehaviorOnOOME.java
+++ b/test/gc/TestSoftReferencesBehaviorOnOOME.java
 /*
- * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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