OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #26 from digitaldan/backport_of_1460 

Backport of https://github.com/openhab/openhab/pull/1460
pull/30/head
Kai Kreuzer 2016-03-14 22:36:49 +01:00
parent 56a96a237d 8c15096a10
commit dc79b2a815
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bundles/org.openhab.core.compat1x/src/main/java/org/openhab/core/library/types/ArithmeticGroupFunction.java
View File

@ -57,7 +57,7 @@ public interface ArithmeticGroupFunction extends GroupFunction {
public State calculate(List<Item> items) {
if(items!=null && items.size()>0) {
for(Item item : items) {
if(!activeState.equals(item.getState())) {
if(!activeState.equals(item.getStateAs(activeState.getClass()))) {
return passiveState;
}
}
@ -132,7 +132,7 @@ public interface ArithmeticGroupFunction extends GroupFunction {
public State calculate(List<Item> items) {
if(items!=null) {
for(Item item : items) {
if(activeState.equals(item.getState())) {
if(activeState.equals(item.getStateAs(activeState.getClass()))) {
return activeState;
}
}