You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devicemap.apache.org by re...@apache.org on 2014/08/05 03:32:17 UTC
svn commit: r1615833 - in
/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap:
DeviceMapClient.java loader/impl/DDRLoader.java
Author: rezan
Date: Tue Aug 5 01:32:17 2014
New Revision: 1615833
URL: http://svn.apache.org/r1615833
Log:
DMAP-60 bug warning
Modified:
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/DeviceMapClient.java
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/impl/DDRLoader.java
Modified: incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/DeviceMapClient.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/DeviceMapClient.java?rev=1615833&r1=1615832&r2=1615833&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/DeviceMapClient.java (original)
+++ incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/DeviceMapClient.java Tue Aug 5 01:32:17 2014
@@ -144,7 +144,7 @@ public class DeviceMapClient {
continue;
}
- LOG.log(Level.FINER, "Hit candidate: {0} => {1}", new Object[]{hit, device.getId()});
+ LOG.log(Level.FINER, "Hit candidate: ''{0}'' => ''{1}'' ({2})", new Object[]{hit, device.getId(), device.getType()});
if (winner != null) {
if ("simple".equals(winner.getType()) && !"simple".equals(device.getType())) {
Modified: incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/impl/DDRLoader.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/impl/DDRLoader.java?rev=1615833&r1=1615832&r2=1615833&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/impl/DDRLoader.java (original)
+++ incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/impl/DDRLoader.java Tue Aug 5 01:32:17 2014
@@ -185,12 +185,19 @@ public class DDRLoader implements Loader
} else {
device.getPatterns().setOrPattern(patterns);
}
+
+ // TODO DMAP-60 - type is a pattern attribute
+ String type = "weak";
if (builder.equals("SimpleDeviceBuilder")) {
- device.setType("simple");
- } else {
- device.setType("weak");
+ type = "simple";
+ }
+
+ if (device.getType() != null && !type.equals(device.getType())) {
+ LOG.log(Level.FINE, "ERROR: changing type of ''{0}'' from {1} to {2}", new Object[]{id, device.getType(), type});
}
+
+ device.setType(type);
} else {
LOG.log(Level.FINE, "ERROR: device not found: ''{0}''", id);
}