You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2006/12/08 18:29:12 UTC
svn commit: r484666 - in
/incubator/roller/trunk/src/org/apache/roller/pojos: AutoPingData.java
PingQueueEntryData.java PingTargetData.java
Author: agilliland
Date: Fri Dec 8 09:29:10 2006
New Revision: 484666
URL: http://svn.apache.org/viewvc?view=rev&rev=484666
Log:
cannot reference associated objects directly when using lazy fetching, so instead we must use the getter method.
Modified:
incubator/roller/trunk/src/org/apache/roller/pojos/AutoPingData.java
incubator/roller/trunk/src/org/apache/roller/pojos/PingQueueEntryData.java
incubator/roller/trunk/src/org/apache/roller/pojos/PingTargetData.java
Modified: incubator/roller/trunk/src/org/apache/roller/pojos/AutoPingData.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/pojos/AutoPingData.java?view=diff&rev=484666&r1=484665&r2=484666
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/pojos/AutoPingData.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/pojos/AutoPingData.java Fri Dec 8 09:29:10 2006
@@ -147,7 +147,7 @@
{
return false;
}
- if (website != null ? !website.equals(autoPingData.getWebsite()) : autoPingData.getWebsite() != null) {
+ if (getWebsite() != null ? !getWebsite().equals(autoPingData.getWebsite()) : autoPingData.getWebsite() != null) {
return false;
}
@@ -168,6 +168,6 @@
* @see Object#toString()
*/
public String toString() {
- return "AutoPingData{" + "id='" + id + "'" + ", pingTarget=" + pingTarget + ", website= " + (website == null ? "null" : "{id='" + website.getId() + "'} ") + "}";
+ return "AutoPingData{" + "id='" + id + "'" + ", pingTarget=" + pingTarget + ", website= " + (getWebsite() == null ? "null" : "{id='" + getWebsite().getId() + "'} ") + "}";
}
}
Modified: incubator/roller/trunk/src/org/apache/roller/pojos/PingQueueEntryData.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/pojos/PingQueueEntryData.java?view=diff&rev=484666&r1=484665&r2=484666
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/pojos/PingQueueEntryData.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/pojos/PingQueueEntryData.java Fri Dec 8 09:29:10 2006
@@ -209,7 +209,7 @@
{
return false;
}
- if (website != null ? !website.equals(pingQueueEntryData.getWebsite()) : pingQueueEntryData.getWebsite() != null)
+ if (getWebsite() != null ? !getWebsite().equals(pingQueueEntryData.getWebsite()) : pingQueueEntryData.getWebsite() != null)
{
return false;
}
@@ -231,6 +231,6 @@
* @see Object#toString()
*/
public String toString() {
- return "PingQueueEntryData{" + "id='" + id + "'" + ", entryTime=" + entryTime + ", pingTarget=" + pingTarget + ", website= " + (website == null ? "null" : "{id='" + website.getId() + "'} ") + ", attempts=" + attempts + "}";
+ return "PingQueueEntryData{" + "id='" + id + "'" + ", entryTime=" + entryTime + ", pingTarget=" + pingTarget + ", website= " + (getWebsite() == null ? "null" : "{id='" + getWebsite().getId() + "'} ") + ", attempts=" + attempts + "}";
}
}
Modified: incubator/roller/trunk/src/org/apache/roller/pojos/PingTargetData.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/pojos/PingTargetData.java?view=diff&rev=484666&r1=484665&r2=484666
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/pojos/PingTargetData.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/pojos/PingTargetData.java Fri Dec 8 09:29:10 2006
@@ -289,7 +289,7 @@
if (pingUrl != null ? !pingUrl.equals(pingTargetData.getPingUrl()) : pingTargetData.getPingUrl() != null) {
return false;
}
- if (website != null ? !website.equals(pingTargetData.getWebsite()) : pingTargetData.getWebsite() != null) {
+ if (getWebsite() != null ? !getWebsite().equals(pingTargetData.getWebsite()) : pingTargetData.getWebsite() != null) {
return false;
}
@@ -304,7 +304,7 @@
* @see java.lang.Object#toString()
*/
public String toString() {
- return "PingTargetData{" + "id='" + id + "'" + ", name='" + name + "'" + ", pingUrl='" + pingUrl + "'" + ", website= " + (website == null ? "null" : "{id='" + website.getId() + "'} ") + ", conditionCode=" + conditionCode + ", lastSuccess=" + lastSuccess + "}";
+ return "PingTargetData{" + "id='" + id + "'" + ", name='" + name + "'" + ", pingUrl='" + pingUrl + "'" + ", website= " + (getWebsite() == null ? "null" : "{id='" + getWebsite().getId() + "'} ") + ", conditionCode=" + conditionCode + ", lastSuccess=" + lastSuccess + "}";
}
}