diff src/share/vm/oops/constantPool.cpp @ 7627:c73c3f2c5b3b

Merge
author acorn
date Mon, 21 Jan 2013 16:11:24 -0500
parents b14da2e6f2dc
children 3ac7d10a6572 5daaddd917a1
line wrap: on
line diff
--- a/src/share/vm/oops/constantPool.cpp	Fri Jan 18 19:13:41 2013 +0100
+++ b/src/share/vm/oops/constantPool.cpp	Mon Jan 21 16:11:24 2013 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -66,7 +66,7 @@
   set_pool_holder(NULL);
   set_flags(0);
   // only set to non-zero if constant pool is merged by RedefineClasses
-  set_orig_length(0);
+  set_version(0);
   set_lock(new Monitor(Monitor::nonleaf + 2, "A constant pool lock"));
   // all fields are initialized; needed for GC
   set_on_stack(false);