[sipana commit] r196 - ORM changed to hold SIPSession changes made in r195.

[codesite...@google.com]

Author: marcoshack
Date: Sat May 16 10:37:39 2009
New Revision: 196

Modified:

trunk/sipana-commons/src/main/java/org/sipana/protocol/sip/SIPSession.java
trunk/sipana-server-ejb/src/main/resources/META-INF/orm.xml

Log:
ORM changed to hold SIPSession changes made in r195.

Modified:
trunk/sipana-commons/src/main/java/org/sipana/protocol/sip/SIPSession.java
==============================================================================
---
trunk/sipana-commons/src/main/java/org/sipana/protocol/sip/SIPSession.java
(original)
+++
trunk/sipana-commons/src/main/java/org/sipana/protocol/sip/SIPSession.java
Sat May 16 10:37:39 2009
@@ -66,10 +66,10 @@
@XmlAttribute
private String toUser;

- private List<SIPMessage> messageList;
+ private List<SIPMessage> messages;

public SIPSession() {
- messageList = new LinkedList<SIPMessage>();
+ messages = new LinkedList<SIPMessage>();
firstResponseTime = 0; // no first response
setupTime = 0; // no setup time
}
@@ -187,13 +187,13 @@
}

public void addMessage(SIPMessage message) {
- synchronized (messageList) {
- messageList.add(message);
+ synchronized (messages) {
+ messages.add(message);
}
}

public List<SIPMessage> getMessageList() {
- return messageList;
+ return messages;
}

@Override
@@ -209,10 +209,10 @@
sb.append(", state=").append(getState());

sb.append(", messageList = {");
- if (!messageList.isEmpty()) {
- for (SIPMessage m : messageList) {
+ if (!messages.isEmpty()) {
+ for (SIPMessage m : messages) {
sb.append(m);
- if (messageList.iterator().hasNext()) {
+ if (messages.iterator().hasNext()) {
sb.append(", ");
}
}

Modified: trunk/sipana-server-ejb/src/main/resources/META-INF/orm.xml
==============================================================================
--- trunk/sipana-server-ejb/src/main/resources/META-INF/orm.xml (original)
+++ trunk/sipana-server-ejb/src/main/resources/META-INF/orm.xml Sat May 16
10:37:39 2009
@@ -45,22 +45,22 @@
<id name="id">
<generated-value strategy="AUTO" />
</id>
- <one-to-many name="requests"
- target-entity="org.sipana.protocol.sip.SIPRequest"
+ <one-to-many name="messages"
+ target-entity="org.sipana.protocol.sip.SIPMessage"
fetch="EAGER">
<join-column name="id_sip_session" />
<cascade>
<cascade-all />
</cascade>
</one-to-many>
- <one-to-many name="responses"
+ <!--one-to-many name="responses"
target-entity="org.sipana.protocol.sip.SIPResponse"
fetch="EAGER">
<join-column name="id_sip_session" />
<cascade>
<cascade-all />
</cascade>
- </one-to-many>
+ </one-to-many-->
</attributes>
</entity>
</entity-mappings>