@@ -1477,13 +1477,15 @@ public class AuctionEntry extends ActiveRecord implements Comparable<AuctionEntr return r_flags; } + private static AuctionInfo sAuction = new AuctionInfo(); + public AuctionInfo getAuction() { - if(mAuction == null) { + if(mAuction == null || mAuction == sAuction) { String aid = get("auction_id"); if(aid != null && aid.length() != 0) { mAuction = AuctionInfo.findFirstBy("id", aid); } - if(mAuction == null && getString("identifier") != null) { + if((mAuction == null || mAuction == sAuction) && getString("identifier") != null) { mAuction = AuctionInfo.findByIdentifier(getString("identifier")); } @@ -1499,6 +1501,8 @@ public class AuctionEntry extends ActiveRecord implements Comparable<AuctionEntr } } + if(mAuction == null) mAuction = sAuction; + return mAuction; } @@ -1510,7 +1514,7 @@ public class AuctionEntry extends ActiveRecord implements Comparable<AuctionEntr * @param inAI - The AuctionInfo object to make the new core data. Must not be null. */ public void setAuctionInfo(AuctionInfo inAI) { - if(mAuction == null) { + if(mAuction == null || mAuction == sAuction) { setDefaultCurrency(inAI.getDefaultCurrency()); } @@ -1682,7 +1686,7 @@ public class AuctionEntry extends ActiveRecord implements Comparable<AuctionEntr /*************************/ public String saveDB() { - if(mAuction == null) return null; + if(mAuction == null || mAuction == sAuction) return null; String auctionId = mAuction.saveDB(); if(auctionId != null) set("auction_id", auctionId); src/com/jbidwatcher/auction/AuctionEntry.java 023fdbaeb7a04360f6fe791db636417035eb00b4 Morgan Schweers cyberfox@jbidwatcher.com http://github.com/cyberfox/jbidwatcher/commit/c7112aca9f4476aaa435258766f9a4b29b9c9a96 c7112aca9f4476aaa435258766f9a4b29b9c9a96 2009-10-10T16:22:18-07:00 2009-10-10T16:22:18-07:00 Use a stub 'AuctionInfo' object, when we can't actually retrieve a real one, so that dozens of methods don't throw NPE's randomly in the moments when an auction is deleted, but the UI is trying to display the entry. git-svn-id: svn://svn.jbidwatcher.com/jbidwatcher/trunk@1021 b1acfa68-eb39-11db-b167-a3a8cd6b847e fb65e1f8ef3fa3b4845b329ae9eb75cb6afd8302 Morgan Schweers cyberfox@jbidwatcher.com