diff options
| -rw-r--r-- | libjava/classpath/lib/java/io/ObjectInputStream$ValidatorAndPriority.class | bin | 786 -> 786 bytes | |||
| -rw-r--r-- | libjava/classpath/lib/java/io/ObjectInputStream.class | bin | 29187 -> 29540 bytes | |||
| -rw-r--r-- | libjava/classpath/lib/java/io/ObjectOutputStream.class | bin | 17829 -> 18158 bytes | |||
| -rw-r--r-- | libjava/gnu/gcj/runtime/BootClassLoader.h | 7 | ||||
| -rw-r--r-- | libjava/java/io/ObjectInputStream.h | 1 | ||||
| -rw-r--r-- | libjava/java/io/ObjectOutputStream.h | 1 | ||||
| -rw-r--r-- | libjava/javax/management/ObjectName.h | 11 |
7 files changed, 20 insertions, 0 deletions
diff --git a/libjava/classpath/lib/java/io/ObjectInputStream$ValidatorAndPriority.class b/libjava/classpath/lib/java/io/ObjectInputStream$ValidatorAndPriority.class Binary files differindex ee951cfdb05..20eacdb3b2b 100644 --- a/libjava/classpath/lib/java/io/ObjectInputStream$ValidatorAndPriority.class +++ b/libjava/classpath/lib/java/io/ObjectInputStream$ValidatorAndPriority.class diff --git a/libjava/classpath/lib/java/io/ObjectInputStream.class b/libjava/classpath/lib/java/io/ObjectInputStream.class Binary files differindex d6ae861ea0c..9cc3755a53f 100644 --- a/libjava/classpath/lib/java/io/ObjectInputStream.class +++ b/libjava/classpath/lib/java/io/ObjectInputStream.class diff --git a/libjava/classpath/lib/java/io/ObjectOutputStream.class b/libjava/classpath/lib/java/io/ObjectOutputStream.class Binary files differindex fb3f40a9d74..2ab5f486baa 100644 --- a/libjava/classpath/lib/java/io/ObjectOutputStream.class +++ b/libjava/classpath/lib/java/io/ObjectOutputStream.class diff --git a/libjava/gnu/gcj/runtime/BootClassLoader.h b/libjava/gnu/gcj/runtime/BootClassLoader.h index df9fcdbe43b..c1d39879894 100644 --- a/libjava/gnu/gcj/runtime/BootClassLoader.h +++ b/libjava/gnu/gcj/runtime/BootClassLoader.h @@ -24,6 +24,7 @@ extern "Java" namespace net { class URL; + class URLClassLoader; } } } @@ -35,10 +36,16 @@ public: // actually package-private BootClassLoader(::java::lang::String *); public: ::java::lang::Class * bootLoadClass(::java::lang::String *); +private: + ::java::net::URLClassLoader * getBootURLLoader(); +public: ::java::net::URL * bootGetResource(::java::lang::String *); ::java::util::Enumeration * bootGetResources(::java::lang::String *); public: // actually package-private static ::java::lang::Class * coreHandler; +private: + jboolean __attribute__((aligned(__alignof__( ::gnu::gcj::runtime::HelperClassLoader)))) initialized; + ::java::net::URLClassLoader * bootURLLoader; public: static ::java::lang::Class class$; }; diff --git a/libjava/java/io/ObjectInputStream.h b/libjava/java/io/ObjectInputStream.h index b27764a445b..eedf6c4aa6f 100644 --- a/libjava/java/io/ObjectInputStream.h +++ b/libjava/java/io/ObjectInputStream.h @@ -75,6 +75,7 @@ private: void callReadMethod(::java::lang::reflect::Method *, ::java::lang::Class *, ::java::lang::Object *); void dumpElement(::java::lang::String *); void dumpElementln(::java::lang::String *); + void dumpElementln(::java::lang::String *, ::java::lang::Object *); static const jint BUFFER_SIZE = 1024; ::java::io::DataInputStream * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) realInputStream; ::java::io::DataInputStream * dataInputStream; diff --git a/libjava/java/io/ObjectOutputStream.h b/libjava/java/io/ObjectOutputStream.h index 273f04b14e4..496da4e35aa 100644 --- a/libjava/java/io/ObjectOutputStream.h +++ b/libjava/java/io/ObjectOutputStream.h @@ -90,6 +90,7 @@ public: // actually package-private virtual jboolean setBlockDataMode(jboolean); private: void callWriteMethod(::java::lang::Object *, ::java::io::ObjectStreamClass *); + void dumpElementln(::java::lang::String *, ::java::lang::Object *); void dumpElementln(::java::lang::String *); static const jint BUFFER_SIZE = 1024; static jint defaultProtocolVersion; diff --git a/libjava/javax/management/ObjectName.h b/libjava/javax/management/ObjectName.h index 21473cace9e..19a0dbfcd1a 100644 --- a/libjava/javax/management/ObjectName.h +++ b/libjava/javax/management/ObjectName.h @@ -24,6 +24,9 @@ class javax::management::ObjectName : public ::java::lang::Object public: ObjectName(::java::lang::String *); +private: + void parse(::java::lang::String *); +public: ObjectName(::java::lang::String *, ::java::lang::String *, ::java::lang::String *); ObjectName(::java::lang::String *, ::java::util::Hashtable *); private: @@ -51,8 +54,16 @@ public: static ::java::lang::String * quote(::java::lang::String *); virtual void setMBeanServer(::javax::management::MBeanServer *); virtual ::java::lang::String * toString(); +private: + void writeObject(::java::io::ObjectOutputStream *); + void readObject(::java::io::ObjectInputStream *); +public: static ::java::lang::String * unquote(::java::lang::String *); private: + static const jlong serialVersionUID = 1081892073854801359LL; +public: + static ::javax::management::ObjectName * WILDCARD; +private: ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) domain; ::java::util::TreeMap * properties; ::java::lang::String * propertyListString; |