diff --git a/hello.txt b/hello.txt deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/src/wrapper/SmartSpaceKPI.java b/src/wrapper/SmartSpaceKPI.java index 5604ecc2b64e78779246a338a6ddce2408525f07..668e2549cb312b269332466babd68b1cac5bf0a1 100644 --- a/src/wrapper/SmartSpaceKPI.java +++ b/src/wrapper/SmartSpaceKPI.java @@ -137,16 +137,16 @@ public class SmartSpaceKPI { for (int i = 0; i < subscriptionIdList.size(); i++) { SmartSpaceTriplet curTriplet = tripletList.get(i); - if (check2Strings(subject, curTriplet.getSubject(), fullMatch)) - if (check2Strings(predicate, curTriplet.getPredicate(), fullMatch)) - if (check2Strings(object, curTriplet.getObject(), fullMatch)) { - SIBResponse unsubscribeResponse = core.unsubscribe(subscriptionIdList.get(i)); - - // у Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñ‹ Ñ Ð¾Ñ‚Ð¿Ð¸Ñкой от интеллектуального проÑтранÑтва - if (!unsubscribeResponse.isConfirmed()) { - exceptionMessage += subscriptionIdList.get(i) + ": " + unsubscribeResponse.Message + '\n'; - } - } + if (checkTwoStrings(subject, curTriplet.getSubject(), fullMatch) && + checkTwoStrings(predicate, curTriplet.getPredicate(), fullMatch) && + checkTwoStrings(object, curTriplet.getObject(), fullMatch)) { + SIBResponse unsubscribeResponse = core.unsubscribe(subscriptionIdList.get(i)); + + // у Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñ‹ Ñ Ð¾Ñ‚Ð¿Ð¸Ñкой от интеллектуального проÑтранÑтва + if (!unsubscribeResponse.isConfirmed()) { + exceptionMessage += subscriptionIdList.get(i) + ": " + unsubscribeResponse.Message + '\n'; + } + } } // проблемы во Ð²Ñ€ÐµÐ¼Ñ Ð¾Ñ‚Ð¿Ð¸Ñки были, Ñигнализируем Ñто @@ -155,7 +155,7 @@ public class SmartSpaceKPI { } } - private boolean check2Strings(String mainString, String curString, boolean fullMatch) { + private boolean checkTwoStrings(String mainString, String curString, boolean fullMatch) { if (mainString == null) if (fullMatch) return (curString == null);