You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by jt...@apache.org on 2021/06/27 19:11:31 UTC

[netbeans-html4j] 04/08: Resolving conflicts with master

This is an automated email from the ASF dual-hosted git repository.

jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git

commit ddc58464f3e92f25ab28dcf7f39a3c71263243ba
Merge: ceb72dd d22fa01
Author: Jaroslav Tulach <ja...@apidesign.org>
AuthorDate: Sun Jun 27 15:20:58 2021 +0200

    Resolving conflicts with master

 generic/src/main/java/org/netbeans/html/presenters/spi/Generic.java | 1 +
 1 file changed, 1 insertion(+)

diff --cc generic/src/main/java/org/netbeans/html/presenters/spi/Generic.java
index cb71237,af0b99c..124e953
--- a/generic/src/main/java/org/netbeans/html/presenters/spi/Generic.java
+++ b/generic/src/main/java/org/netbeans/html/presenters/spi/Generic.java
@@@ -787,10 -770,12 +787,11 @@@ abstract class Generic implements Fn.Pr
      })
      void flushImpl() {
          synchronized (lock()) {
 -            StringBuilder def = getDeferred(false);
 -            if (def != null) {
 +            if (topMostCall() instanceof DeferJavaScript) {
                  final int id = nextCallId();
 -                log(Level.FINE, "flush#{1}: {0}", def, id);
 +                log(Level.FINE, "flush#{1}: {0}", topMostCall(), id);
                  exec(id, Strings.flushExec(key, id).toString());
+                 lock().notifyAll();
              }
              if (topMostCall() == null) {
                  resetDeferredDisabled();

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists