Merge branch 'develop' of ssh://den.jabber.ru:2205/var/lib/git/com.juick.api into develop

1 files changed, 2 insertions, 1 deletions

diff --git a/src/main/java/com/juick/api/PM.java b/src/main/java/com/juick/api/PM.java
index ffcd155a..f22a4add 100644
--- a/src/main/java/com/juick/api/PM.java
+++ b/src/main/java/com/juick/api/PM.java
@@ -10,6 +10,7 @@ import com.juick.xmpp.extensions.JuickMessage;
 import java.io.IOException;
 import java.sql.Connection;
 import java.util.ArrayList;
+import java.util.List;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -40,7 +41,7 @@ public class PM {
             return;
         }
 
-        ArrayList<com.juick.Message> msgs = PMQueries.getPMMessages(sql, vuid, uid);
+        List<com.juick.Message> msgs = PMQueries.getPMMessages(sql, vuid, uid);
         if (msgs != null && !msgs.isEmpty()) {
             String json = messageSerializer.serializeList(msgs);
             Main.replyJSON(request, response, json);