[sipana commit] r197 - Fix on method getSIPSessions() of SIPSessionManagerBean due the change in the SIPSession e...

[codesite...@google.com]

Author: marcoshack
Date: Sat May 16 13:03:53 2009
New Revision: 197

Modified:

trunk/sipana-server-ejb/src/main/java/org/sipana/server/dao/SIPSessionManagerBean.java

Log:
Fix on method getSIPSessions() of SIPSessionManagerBean due the change in
the SIPSession entity classe.

Modified:
trunk/sipana-server-ejb/src/main/java/org/sipana/server/dao/SIPSessionManagerBean.java
==============================================================================
---
trunk/sipana-server-ejb/src/main/java/org/sipana/server/dao/SIPSessionManagerBean.java
(original)
+++
trunk/sipana-server-ejb/src/main/java/org/sipana/server/dao/SIPSessionManagerBean.java
Sat May 16 13:03:53 2009
@@ -65,7 +65,7 @@
StringBuilder sbQuery = new StringBuilder("SELECT DISTINCT s FROM
SIPSession s ");

if (ipAddrList != null && ipAddrList.size() > 0) {
- sbQuery.append("INNER JOIN s.requests AS r ");
+ sbQuery.append("INNER JOIN s.messages AS m ");
}

sbQuery.append("WHERE s.startTime >= :start AND s.endTime
<= :end ");
@@ -87,9 +87,10 @@
}

if (ipAddrList != null && ipAddrList.size() > 0) {
- String ipAddrInList = new
StringBuilder("'").append(StringUtils.join(ipAddrList, "','")).append("'").toString();
- sbQuery.append("AND (r.srcAddress IN (").append(ipAddrInList);
- sbQuery.append(") OR r.dstAddress IN
(").append(ipAddrInList).append(")) ");
+ String csvList = StringUtils.join(ipAddrList, "','");
+ String ipAddrInList = new
StringBuilder("'").append(csvList).append("'").toString();
+ sbQuery.append("AND (m.srcAddress IN (").append(ipAddrInList);
+ sbQuery.append(") OR m.dstAddress IN
(").append(ipAddrInList).append(")) ");
}

// If startTime/endTime is null set it to min/max values