You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jo...@apache.org on 2006/08/12 15:09:31 UTC
svn commit: r431030 - in /incubator/ofbiz/trunk:
applications/securityext/build.xml
framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java
Author: jonesde
Date: Sat Aug 12 06:09:30 2006
New Revision: 431030
URL: http://svn.apache.org/viewvc?rev=431030&view=rev
Log:
Made ServerHitBin work with or without partyId; fixed securityext build file
Modified:
incubator/ofbiz/trunk/applications/securityext/build.xml
incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java
Modified: incubator/ofbiz/trunk/applications/securityext/build.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/securityext/build.xml?rev=431030&r1=431029&r2=431030&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/securityext/build.xml (original)
+++ incubator/ofbiz/trunk/applications/securityext/build.xml Sat Aug 12 06:09:30 2006
@@ -45,6 +45,7 @@
<fileset dir="../../framework/service/build/lib" includes="*.jar"/>
<fileset dir="../../framework/webapp/lib" includes="*.jar"/>
<fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
+ <fileset dir="../../framework/common/build/lib" includes="*.jar"/>
<fileset dir="../party/build/lib" includes="*.jar"/>
<fileset dir="../product/build/lib" includes="*.jar"/>
<fileset dir="../order/build/lib" includes="*.jar"/>
Modified: incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java?rev=431030&r1=431029&r2=431030&view=diff
==============================================================================
--- incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java (original)
+++ incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java Sat Aug 12 06:09:30 2006
@@ -31,6 +31,7 @@
import org.ofbiz.entity.GenericDelegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
+import org.ofbiz.entity.model.ModelEntity;
/**
* <p>Counts server hits and tracks statistics for request, events and views
@@ -621,7 +622,10 @@
serverHit.set("hitTypeId", ServerHitBin.typeIds[this.type]);
if (userLogin != null) {
serverHit.set("userLoginId", userLogin.get("userLoginId"));
- serverHit.set("partyId", userLogin.get("partyId"));
+ ModelEntity modelUserLogin = userLogin.getModelEntity();
+ if (modelUserLogin.isField("partyId")) {
+ serverHit.set("partyId", userLogin.get("partyId"));
+ }
}
serverHit.set("contentId", this.id);
serverHit.set("runningTimeMillis", new Long(runningTime));