Author: dongxu
Date: Thu Sep 12 03:22:53 2013
New Revision: 1522192
URL: http://svn.apache.org/r1522192
Log:
fix the serialization issue.
Modified:
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java
Modified:
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java?rev=1522192&r1=1522191&r2=1522192&view=diff
==============================================================================
---
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java
(original)
+++
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java
Thu Sep 12 03:22:53 2013
@@ -19,6 +19,10 @@
package org.apache.hupa.shared.rpc;
+import java.io.Serializable;
+
+import com.google.gwt.user.client.rpc.IsSerializable;
+
<<<<<<< HEAD
<<<<<<< HEAD
@@ -97,6 +101,7 @@ public class ContactsResult{
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
>>>>>>> first commit
public static class Contact implements Result, Serializable {
@@ -157,6 +162,10 @@ public class ContactsResult{
=======
public static class Contact {
>>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add
>>>>>>> license headers to all new files
+=======
+ public static class Contact implements IsSerializable, Serializable{
+ private static final long serialVersionUID = -8632580327693416473L;
+>>>>>>> fix the serialization issue.
public String mail;
public String realname;
@@ -216,7 +225,6 @@ public class ContactsResult{
}
- private static final long serialVersionUID = -8740775403377441876L;
private Contact[] contacts;
public ContactsResult() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
